A fix for the broken test
Merge remote-tracking branch 'matthias-ronge/issue_217' into feature-zm

Conflicts:
	Goobi/src/de/sub/goobi/forms/GranularityForm.java
Merge remote-tracking branch 'matthias-ronge/issue_219' into feature-zm
Merge remote-tracking branch 'matthias-ronge/issue_221' into feature-zm

Conflicts:
	Goobi/src/de/sub/goobi/beans/Batch.java
	Goobi/src/de/sub/goobi/helper/tasks/CreateProcessesTask.java
Merge remote-tracking branch 'matthias-ronge/issue_223' into feature-zm
Merge remote-tracking branch 'matthias-ronge/fix-broken-test' into feature-zm
Merge remote-tracking branch 'matthias-ronge/issue_226' into feature-zm
Merge remote-tracking branch 'matthias-ronge/issue_228' into feature-zm
Add image representative status text, and add missing English label
Merge branch 'i171fzm_2' into feature-zm_all

Conflicts:
	Goobi/src/messages/messages_de.properties
	Goobi/src/messages/messages_en.properties