Merge origin/master

Conflicts:
	src/java/biz/DepartmentManager.java
	src/java/da/DepartmentJpaController.java
	src/java/ui/DepartmentUI.java