Remove 'Orm_Model' from APPPATH/bootstrap.php
Merge branch 'feature/gasorm' into develop

Conflicts:
	fuel/app/bootstrap.php