Added CKEditor 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