Updating settings for production
Merge branch 'christian'
Modified the settings for production