edit settings for production
Merge remote-tracking branch 'origin/development' into production
Merge remote-tracking branch 'origin/development' into production
add additional settings
Merge remote-tracking branch 'origin/development' into production
Merge remote-tracking branch 'origin/development' into production
change config files
fix static root