Server settings
Merge branch 'master' of https://github.com/dtiburon/big-bang