Renaming to an actual dialog name
Merge branch 'master' of https://github.com/Mindfly/uLocate

Conflicts:
	src/UmbracoTestSite/App_Plugins/uLocate/Scripts/Controllers/example.dialog.controller.js
	src/uLocate.UI/App_Plugins/uLocate/Dialogs/edit.dialog.controller.js
	src/uLocate.UI/App_Plugins/uLocate/Dialogs/example.dialog.controller.js
	src/uLocate.UI/App_Plugins/uLocate/package.manifest
Working on the flyout dialogs