Marker Info Displays on Click
Merge branch 'master' of https://github.com/chyld/civic-hacking

Conflicts:
	app/static/js/es6/maps.es6.js