Config file
Merge branch 'master' of https://github.com/atlasapi/atlas-admin into mbst-8434-direct-login