cleanup and todox
Merge branch 'develop' of github.com:impresspages/ImpressPages-CMS into develop