Deployment settings
Merge remote-tracking branch 'origin/master' into deployment
Added ElasticSearch feature.
Update default login and password for supervisor. Don't try. It's different on deployment.