Fixed bug in ORM not returning loaded model by id
ob_get_clean for view
Merging with updates

Merge branch 'master' of https://github.com/dracony/PHPixie

Conflicts:
	modules/orm/classes/orm.php