Merge branch 'Jascha' of

https://git.tk.informatik.tu-darmstadt.de/julien.gedeon/bp-scopviz.git
into Jascha

Conflicts:
	scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/io/GraphMLImporter.java

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/io/GraphMLImporter.java

@@ -73,7 +73,11 @@ public class GraphMLImporter {
 			if (!n.hasAttribute("long")) {
 				n.addAttribute("long", OptionsManager.getDefaultLong());
 			}
+<<<<<<< HEAD
 			if (!n.hasAttribute("ui.label") && n.hasAttribute("yEd.label")) {
+=======
+			if (!n.hasAttribute("ui.label") && n.hasAttribute("yEd.label")){
+>>>>>>> branch 'Jascha' of https://git.tk.informatik.tu-darmstadt.de/julien.gedeon/bp-scopviz.git
 				n.addAttribute("ui.label", n.getAttribute("yEd.label").toString());
 				n.removeAttribute("yEd.label");
 			}

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/OptionsManager.java

@@ -58,7 +58,6 @@ public final class OptionsManager {
 		grid.setHgap(10);
 		grid.setVgap(10);
 		grid.setPadding(new Insets(20, 150, 10, 10));
-
 		// create dialog elements
 		TextField defaultWeightField = new TextField(Integer.toString(defaultWeight));