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

Conflicts:
	src/UmbracoTestSite/bin/uLocate.Plugins.Geocode.GoogleMaps.dll
	src/UmbracoTestSite/bin/uLocate.UI.dll
	src/UmbracoTestSite/bin/uLocate.dll