Merge branch 'Content-Rendering'
Merge branch 'master' of https://github.com/HARING/TYPO3-Crystalis