define production settings
merge changes from upstream settings.py
Merge branch 'master' into eHealth_production (get upstream updates)
Merge branch 'structured-settings'