holiday test
Merge branch 'develop' of github.com:mibto/mez into develop

Conflicts:
	src/main/java/ch/bli/mez/controller/EmployeeController.java