fix message link in header
add cityvoice logo to footer
update header
Merge branch 'master' into front_end
header-footer links
fix formatting for email notifications signup
Merge branch 'master' into front_end
marker color styling test
Merge branch 'front_end' into map_cluster_refine
white cluster marker and drop shadow
make marker clusters white
custom marker, initial
Fix icons real quick over screenshare
gray custom markers and clustering
Merge branch 'pr/108' into pr-merge-resolution
Merge branch 'pr-merge-resolution' into pr/104-merging

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb
Merge branch 'master' into pr/104-merging
Tweaking logo and footer