Conflicts:
	.yo-rc.json
	package-lock.json
	src/main/resources/config/liquibase/master.xml
	src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
	src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts
	src/main/webapp/app/search/search.component.ts
	src/main/webapp/i18n/de/global.json