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/view/GUI$2.class
#	bin/ui/view/GUI$4.class
#	bin/ui/view/GUI$5.class
#	bin/ui/view/GUI.class

src/ui/view/GUI.java

@@ -138,7 +138,7 @@ public class GUI implements CategoryListener {
 		menuBar.add(mnHelp);
 
 		// Table
-		String[] columnNames = { "Gadget", "+/-", "Energy", "Quantity" };
+		String[] columnNames = { "Gadget", "Typ", "Energy", "Quantity" };
 
 		Object[][] data = {};