Allow server config to overwrite local configs
Change criterions app_env when testing
Fix tests
PSR
Merge pull request #64 from romhut/feature/overwrite-with-server-config

Overwrite with server config