change "from django_project.settings" to correct "from django.conf import settings" to allow override of the settings via the DJANGO_SETTINGS_MODULE environment
make help-inline empty
Merge branch 'master' into feature/ansible