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

Conflicts:
	bin/ui/controller/Control.class
	bin/ui/view/GUI$2.class
	bin/ui/view/GUI$3.class
	bin/ui/view/GUI$4.class
	bin/ui/view/GUI$5.class
	bin/ui/view/GUI$6.class
	src/ui/controller/Control.java

src/ui/controller/Control.java

@@ -91,10 +91,16 @@ public class Control {
 		objectController.addNewElementIntoCategoryObject(catName, objName, eleName, amount, energy);
 	}
 
+<<<<<<< HEAD
 	public void deleteElement() {
 
+=======
+	public void deleteElement(){
+		
+>>>>>>> 23fbd1311595765cdebdde88b8482bc96d187ca3
 	}
 
+
 	////////// etc
 	/**
 	 * Getter for Model