Fix bug #223
Merge remote-tracking branch 'origin/issue_223' into feature-zm_all

Conflicts:
	Goobi/WEB-INF/lib/ugh-1.10.jar