Conflicts:
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_ar.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_bg.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_cs.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_da.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_de.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_el.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_en.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_es.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_fr.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_it.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_jp.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_nl_NL.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_pl.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_pt_BR.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_pt_PT.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_ru.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_sq.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_zh_CN.properties
	src/main/java/org/olat/course/nodes/cp/_i18n/LocalStrings_zh_TW.properties
	src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_fr.properties
	src/main/java/org/olat/course/nodes/survey/_i18n/LocalStrings_fr.properties
	src/main/webapp/static/themes/light/content.css.map
	src/main/webapp/static/themes/light/theme.css
	src/main/webapp/static/themes/light/theme.css.map
	src/main/webapp/static/themes/openolat/content.css.map
	src/main/webapp/static/themes/openolat/theme.css
	src/main/webapp/static/themes/openolat/theme.css.map