Merge origin/master

Conflicts:
	view/form_user.php
Merge origin/master