Hooray for Google Maps!!!
Beacon: there can be only 1!!!
Merge commit 'f521fcd4624f915d61c3f1c8bea935e0a269fcaa'

Conflicts:
	app/client/js/beacon.js
	app/server/views/index.jade