Merge remote-tracking branch 'matthias-ronge/issue_168_rebased' into feature-zm

Conflicts:
	Goobi/plugins/opac/PicaPlugin.jar
Merge remote-tracking branch 'matthias-ronge/new-layout' into feature-zm
Merge remote-tracking branch 'matthias-ronge/flexible-ruleset-elements' into feature-zm
Add possibility to remove XML entities in OPAC beautifier
Merge branch 'issue_244' into feature-zm_all

Conflicts:
	Goobi/plugins/opac/PicaPlugin.jar
	Goobi/plugins/opac/PicaPlugin/org/goobi/production/plugin/CataloguePlugin/PicaPlugin/ConfigOpacCatalogue.java