Merge origin/joey_anton_testing into joey_anton_testing

Conflicts:
	app/models/User.php