City and user profile css tweaks
Rename city in BS
Merge branch 'master' of github.com:ssg-org/ssg

Conflicts:
	app/assets/stylesheets/common.css.scss