Redirect /me to the homepage with 301 Moved Permanently
Added staging server
Merge pull request #29 from Coenego/staging-server

Added staging server
Changed search version
Nightly fix
Merge pull request #30 from Coenego/nightly-fix

Update for the staging environment
Changed the Google authentication strategy credentials for staging
Merge pull request #31 from Coenego/staging-google-auth

Changed the Google authentication strategy credentials for staging
Merge pull request #28 from timdegroote/redirect-me

Redirect /me to the homepage with 301 Moved Permanently
Logstash configuration

Added configuration for Logstash.
Merge pull request #33 from Coenego/logstash

Logstash configuration
Surround the config_monitoring_host variable by single quotes
Nightly script fix

Hilary needs more time to restart after the nightly deploy. Letting the server sleep for 30 seconds more.
Merge pull request #34 from Coenego/nightly-fix-timeout

Nightly script fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/nginx/templates/user_tenant_nginx.conf.erb