Added Vieo EditorTemplate.
cleaned up google maps
Merge remote-tracking branch 'upstream/scaffr-membership' into pr/n41_vcardins

Conflicts:
	DemoApplication/DemoApplication/Controllers/Components/ComponentsController.GoogleMaps.cs
	DemoApplication/DemoApplication/Controllers/Components/ComponentsController.Wizard.cs
	DemoApplication/DemoApplication/DemoApplication.csproj
	DemoApplication/DemoApplication/Sitemaps/System.sitemap