Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/make-update-templates-django-admin-util
