wip
wip
wip
Merge branch 'master' of https://github.com/Blendtec/users

Conflicts:
	Controller/UsersController.php