change google api-key
Use Settingslogic & Dotenv
Merge branch 'master' into develop

Conflicts:
	app/views/translates/index.html.haml
Merge branch 'develop'