Finished the map on the locations page
Merge branch 'master' of https://github.com/Mindfly/uLocate

Conflicts:
	src/UmbracoTestSite/Config/ClientDependency.config
	src/UmbracoTestSite/Config/trees.config
	src/UmbracoTestSite/bin/uLocate.UI.dll
	src/uLocate.UI/uLocate.UI.csproj