Conflicts:
	build.gradle
	manual/Manual_DE.tex
	manual/Manual_EN.tex
	src/main/java/kieker/diagnosis/controller/MainController.java
	src/main/resources/locale/kieker/diagnosis/view/about/aboutdialogview.properties
	src/main/resources/locale/kieker/diagnosis/view/about/aboutdialogview_de.properties