Merge origin/master

Conflicts:
	controllers/UserController.php
	models/User.php
	views/user/register.php