Merge remote-tracking branch 'origin/master'
-rw-r--r-- 23 .gitignore
-rwxr-xr-x 248 manage.py
drwxr-xr-x - pkgs
drwxr-xr-x - plgng
drwxr-xr-x - qcg
-rw-r--r-- 98 requirements.txt
-rw-r--r-- 57 requirements_dev.txt