Update config for multi-server
Merge branch 'develop' into feature/bootstrap3