blub
Merge remote-tracking branch 'origin/work' into work

Conflicts:
	src/ch/jmanagr/ui/users/UserDetailController.java