Upload Mathew's model class
Initial base changes
Merge remote-tracking branch 'upstream/staging' into nestedmodels
Merge remote-tracking branch 'upstream/staging' into nestedmodels
WIP on the models
Merge remote-tracking branch 'upstream/staging' into nestedmodels
Merge branch 'nestedmodels' into contactstuff

Conflicts:
	libraries/cms/model/cms.php
	libraries/cms/model/cmsactions.php
	libraries/cms/model/cmsform.php
	libraries/cms/model/cmsitem.php
	libraries/cms/model/cmslist.php