Merge pull request #1 from n2cms/master

Whitespace fixes to avoid merge conflicts
Another ISafeContentRender fix
Merge remote-tracking branch 'source/master'
Merge pull request #416 from jsassner/master

Add ISafeContentRender encoding to Add new item, position tab. Links to #362