Merge origin/master

Conflicts:
	admin/menu/menu-left.php
	nbproject/project.xml
Merge origin/master

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