Merge branch 'master' into lex-deploy

Conflicts:
	app/assets/css/styles.css.erb
Resolve merge conflict
Fix city name