Merge origin/master

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