Merge remote-tracking branch 'origin/nr/monitoring-clemens' into

master-maus-drag-listener-update

Conflicts:
	src/de/tud/kom/p2psim/impl/topology/views/VisualizationTopologyView.java
	src/de/tud/kom/p2psim/impl/topology/views/visualization/world/TopologyComponentVis.java