Conflicts:
	src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
	src/main/resources/serviceconfig/olat.properties
	src/main/webapp/static/themes/light/theme.css
	src/main/webapp/static/themes/light/theme.css.map
	src/main/webapp/static/themes/openolat/theme.css
	src/main/webapp/static/themes/openolat/theme.css.map