Bug fixes
Merge branch 'master' into develop

Conflicts:
	CmsWeb/Code/ViewExtensions.cs