Conflicts:
	Goobi/.gitignore
	Goobi/src/c3p0.properties
	Goobi/src/contentServerConfig.xml
	Goobi/src/ehcache.xml
	Goobi/src/goobi_config.properties
	Goobi/src/goobi_loginBlacklist.txt
	Goobi/src/goobi_opacLanguages.txt
	Goobi/src/goobi_opacUmlaut.txt
	Goobi/src/hibernate.cfg.xml
	Goobi/src/log4j.properties
	Goobi/src/quartz.properties