Partial merge.
Merge branch 'master' of https://github.com/Mindfly/uLocate

Conflicts:
	src/UmbracoTestSite/App_Plugins/uLocate/Css/ulocate.min.css