Cleanup
Merge branch 'develop' of github.com:Wishjuh/UmbracoBase into develop

Conflicts:
	.gitignore