added maps, some responsive design tweaks
typo
Merge branch 'master' into kf-small-design-changes

Conflicts:
	css/city.css
	css/common.css