show in map
Added images
Merge branch 'show-in-map'

Conflicts:
	js/megaphone.js