added assets for file upload
TFM-182 #time 4h #comment The google maps editor template was developed in demo application.
Added CKEditor EditorTemplate
Added Vieo EditorTemplate.
Merge pull request #26 from vcardins/ckeditor

Added CKEditor EditorTemplate
Merge branch 'file-upload' into scaffr-membership

Conflicts:
	DemoApplication/DemoApplication/Controllers/Components/ComponentsController.cs
	DemoApplication/DemoApplication/DemoApplication.csproj
	DemoApplication/DemoApplication/Sitemaps/System.sitemap
fixed merge issues
added missing assets to file upload
Merge pull request #30 from rodmjay/file-upload

File upload
Ignore Files\*.* - Uploaded Files
Refactor Editor Templates
Merge pull request #31 from AAndharia/Refactors

Refactors
refactors to daniel's google maps tempalte
Merge remote-tracking branch 'upstream/scaffr-membership' into pr/n35_dsmoreira

Conflicts:
	DemoApplication/DemoApplication/Controllers/Components/ComponentsController.cs
	DemoApplication/DemoApplication/DemoApplication.csproj
cleanup the merged files
Merge pull request #36 from rodmjay/pr/n35_dsmoreira

Pr/n35 dsmoreira
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
Merge remote-tracking branch 'wcpro/scaffr-membership' into calendar

Conflicts:
	DemoApplication/DemoApplication/Content/Less/global/components/components.less
	DemoApplication/DemoApplication/Controllers/Components/ComponentsController.GoogleMaps.cs
	DemoApplication/DemoApplication/Controllers/Components/ComponentsController.Wizard.cs
	DemoApplication/DemoApplication/Controllers/Components/ComponentsController.cs
	DemoApplication/DemoApplication/DemoApplication.csproj
	DemoApplication/DemoApplication/Scripts/lib/bundle.txt
	DemoApplication/DemoApplication/Sitemaps/System.sitemap