Calculate Global Time
Merge remote-tracking branch 'origin/development' into replay

Conflicts:
	src/main/java/org/geppetto/simulation/SimulationService.java