Improvements and controllers
Merge branch 'master' of github.com:CaptainFalcon92/Shuttle_Scratch

Conflicts:
	model/BaseModel.php