Fixes to ModelController
Merge branch 'master' of github.com:ivebeenlinuxed/Boiler

Conflicts:
	framework/system/controller/api/ModelController.php
Merge branch 'master' of github.com:ivebeenlinuxed/Boiler

Conflicts:
	framework/system/controller/api/ModelController.php