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

src/ui/view/GUI.java

@@ -922,9 +922,9 @@ public class GUI<E> implements CategoryListener {
 									((HolonSwitch) getActualCps()).setManualState(bTemp);
 								}
 							}
-						} else if (getActualCps() instanceof HolonObject) {
+						}// else if (getActualCps() instanceof AbstractCpsObject) {
 							getActualCps().setName(temp.toString());
-						}
+						//}
 					} else {
 						temp = tableModelProperties.getValueAt(selValueY, selValueX);
 						btemp = tableModelProperties.getValueAt(mousePos.y / tableProperties.getRowHeight(),