new settings scheme
Merge branch 'master' into newsettings

Conflicts:
	djangoproject/frespo/settings.py
getting prod vars from os.environ
sandbox need no database
Make tests runnable in pycharm (almost good)