refactor widgets
Merge branch '4.0' of github.com:impresspages/ImpressPages-CMS into 4.0

Conflicts:
	Ip/Module/Content/System.php
	Ip/Sugar.php