Merge branch 'master' of https://github.com/FrenzelGmbH/scms

Conflicts:
widgets/PortletSinglePage.php
fix