Added django-extensions to local requirements
Added django-extensions to local INSTALLED_APPS
Merge remote-tracking branch 'origin/develop' into develop