Merge branch 'master' into quizzes

Conflicts:
	karmaworld/settings/dev.py

diff --combined reqs/common.txt
index 8c6ac1cb5769666164dfa438778dd1d9a63f6163,9a058cf9cada881b67628e85a23ecb8e8d92af1e..183d85b4574d0140e198fe09de0a7e96ef687575
--- 1/reqs/common.txt
--- 2/reqs/common.txt
+++ b/reqs/common.txt
@@@ -9,7 -9,7 +9,7 @@@ urllib3==1.
  google-api-python-client==1.0
  django-grappelli==2.4.8
  git+https://github.com/FinalsClub/django-taggit.git
- git+https://github.com/btbonval/django-filepicker
+ git+https://github.com/btbonval/django-filepicker.git
  filemagic==1.6
  requests
  beautifulsoup4
@@@ -22,4 -22,3 +22,4 @@@ django-allaut
  boto==2.6.0
  django-storages==1.1.4
  django-reversion
 +git+https://github.com/Soaa-/django-nested-inlines.git