Merge branch 'master' into forum
-rw-r--r-- 334 .gitignore
-rw-r--r-- 34519 LICENSE
-rw-r--r-- 836 NOTICE
drwxr-xr-x - catalogue
drwxr-xr-x - chunks
drwxr-xr-x - contact
drwxr-xr-x - curriculum
drwxr-xr-x - edumed
-rw-r--r-- 210 fabfile.py
-rwxr-xr-x 249 manage.py
-rw-r--r-- 25 requirements-dev.txt
-rw-r--r-- 545 requirements.txt