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

Conflicts:
	src/ch/jmanagr/ui/resources/resources.fxml
Merge remote-tracking branch 'origin/work' into work
revert