Merge branch 'master' of...

Merge branch 'master' of dev.kom.e-technik.tu-darmstadt.de:simonstrator/simonstrator-peerfactsim into tf/resourcemarket

Conflicts:
	src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java
	src/de/tud/kom/p2psim/impl/topology/movement/modular/transition/SocialTransitionStrategy.java
	src/de/tud/kom/p2psim/impl/topology/movement/modularosm/ModularMovementModel.java
	src/de/tud/kom/p2psim/impl/topology/movement/modularosm/transition/SocialTransitionStrategy.java
	src/de/tud/kom/p2psim/impl/topology/views/VisualizationTopologyView.java
	src/de/tud/kom/p2psim/impl/topology/views/wifi/WifiTopologyView.java