^ Basic bugfixes based on setting up JMS Timeowl
# making show form show the correct fields
Merge remote-tracking branch 'refs/remotes/origin/master' into home

Conflicts:
	app/Controller/AppController.php
^ Making the user authentication a lot more DRY by defining the fields in a TimeOwlUser model
!
Merge remote-tracking branch 'refs/remotes/origin/SolidSetup' into home
^ Updating SolidSetup changes to match TimeOwl functionality
!
Merge remote-tracking branch 'refs/remotes/origin/SolidSetup' into home
^ Updating SolidSetup changes to match TimeOwl functionality