added assets for file upload
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