Merge branch 'master' into cake
commit controller
Merge branch 'master' of github.com:mdevlamynck/BookStarter

Conflicts:
	app/Controller/UsersController.php
Merge branch 'master' of github.com:mdevlamynck/BookStarter

Conflicts:
	app/Controller/UsersController.php