Merge branch 'master' into 'nr/monitoring-req-resp'

# Conflicts:
#   src/de/tud/kom/p2psim/impl/topology/movement/modularosm/GPSCalculation.java

src/de/tud/kom/p2psim/impl/topology/movement/modularosm/GPSCalculation.java

@@ -96,6 +96,16 @@ public class GPSCalculation {
 		return metersPerPixel;
 	}
 	
+	public static double getWorldDimensionsX() {
+		return Binder.getComponentOrNull(Topology.class)
+				.getWorldDimensions().getX();
+	}
+	
+	public static double getWorldDimensionsY() {
+		return Binder.getComponentOrNull(Topology.class)
+				.getWorldDimensions().getY();
+	}
+
 	public static double getLatUpper() {
 		return latCenter + ((Binder.getComponentOrNull(Topology.class)
 				.getWorldDimensions().getY()/2) / 111111d);