Merge origin/master

Conflicts:
	models/User.php