Added config files for different environments
Merge branch 'env_settings' into develop