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

Conflicts:
	src/UmbracoTestSite/bin/uLocate.UI.dll
Worked on wiring in the flyouts
Merge branch 'master' of https://github.com/Mindfly/uLocate

Conflicts:
	src/UmbracoTestSite/bin/uLocate.UI.dll