Using own settings.py
Merge branch 'app_settings' into dev