Merge pull request #2750 from learningequality/nalanda-rct3

Nalanda rct3 to nalanda
Merge branch 'nalanda' of github.com:learningequality/ka-lite into nalanda-rct3
Upgrade django-south from 0.7.6 to 0.8.4 (to support index_together)