I updated the UsersController but I'm not sure if this is the newest
Merge branch 'dev' of https://github.com/jr2wolfgang/wb_stage into dev

Conflicts:
	app/Controller/UsersController.php