change settings directory
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/apps/settings/prod.py
change settings directory
change settings directory
change settings directory