Merge remote-tracking branch 'upstream/staging' into nestedmodels
Fixes
Doc blocks
We won't abstract translations yet
Add missing method
Add missing try/catch statements
Cleanup of exceptions
Merge branch 'nestedmodels' into contactstuff

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