Do not reset the environment variable DJANGO_SETTINGS_MODULE
Merge branch 'master' of github.com:unicefuganda/edtrac