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

src/ui/controller/SimulationManager.java

@@ -198,7 +198,7 @@ public class SimulationManager {
 								}
 							}
 							for(Integer tag: tmp.getTag()){
-								if(!(edge.getTags().contains(tag))){
+								if(!(edge.getTags().contains(tag)) && tagTable.get(tag) != null){
 									edge.setFlow(edge.getFlow() + tagTable.get(tag));
 									edge.addTag(tag);
 								}