Merge branch 'dev-master' into dev-grafik

Conflicts:
	helpdesk/lib/model/doctrine/DepartmentPeople.class.php