Refactor code, clean up ContentItem
Merge branch 'master' of github.com:n2cms/n2cms

Conflicts:
	src/Framework/N2/ContentItem.cs