Update branch
Fix deleting items
Merge branch 'nestedmodels' into contactstuff

Conflicts:
	libraries/cms/controller/delete.php
	libraries/cms/model/actions.php