Merge origin/master

Conflicts:
	admin/conf.php
	admin/view-users.php
Merge origin/master

Conflicts:
	admin/conf.php
	admin/view-users.php