Merge branch 'Julian' of
https://git.tk.informatik.tu-darmstadt.de/julien.gedeon/bp-scopviz into
Julian

Conflicts:
scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/GUIController.java
scopviz/src/main/resources/NewBetterCoolerWindowTest.fxml