changed handling of overlays and geolocation
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	app/views/map.js
	app/views/overlay.js
cleanup after merge