Merge origin/master

Conflicts:
	view/confirm_add_user.php
Merge origin/master
Merge origin/master

Conflicts:
	view/confirm_add_user.php
Merge origin/master