Fix website settings
Clean up
Fix website settings
Merge branch 'master' of https://github.com/dynamicweb/solutionset

Conflicts:
	Files/System/Items/ItemType_Website_Settings.xml