Merge branch 'Ohne_Drag_and_Drop' of

https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons.git
into Ohne_Drag_and_Drop

Conflicts:
	src/ui/view/MyCanvas.java

src/ui/view/Main.java

@@ -6,8 +6,6 @@ import java.util.ArrayList;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 
-import com.sun.javafx.geom.Edge;
-
 import ui.controller.*;
 import ui.model.*;
 

src/ui/view/MyCanvas.java

@@ -22,16 +22,18 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JToolTip;
 
+<<<<<<< HEAD
 import com.sun.javafx.geom.Edge;
 
 import classes.CpsEdge;
+=======
+>>>>>>> branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons.git
 import classes.CpsNode;
 import classes.CpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
-import javafx.util.Pair;
 import ui.controller.Control;
 import ui.model.*;