Merge remote-tracking branch 'origin/master' into masterintegration

# Conflicts:
#	src/de/tud/kom/p2psim/impl/topology/movement/modularosm/ModularMultiTypeMovementModel.java
#	src/de/tud/kom/p2psim/impl/topology/movement/modularosm/transition/WeightedTransitionStrategy.java

pom.xml

@@ -12,7 +12,7 @@
 	<distributionManagement>
 		<repository>
 			<id>kom-deploy</id>
-			<url>scp://dev.kom.e-technik.tu-darmstadt.de/srv/www/dev/htdocs/mvn</url>
+			<url>scp://dev.kom.e-technik.tu-darmstadt.de/mvn</url>
 		</repository>
 	</distributionManagement>
 
@@ -412,7 +412,7 @@
 		<dependency>
 			<groupId>maki</groupId>
 			<artifactId>simonstrator-traci</artifactId>
-			<version>0.1-SNAPSHOT</version>
+			<version>0.2-SNAPSHOT</version>
 		</dependency>
 		-->