Simple Functionality
Merge remote-tracking branch 'origin/maps' into maps

Conflicts:
	PandoLabs/PandoLabs.Web/Views/Map/Map.cshtml