Merge branch 'master' into salient_behavior
# Conflicts: # VadereSimulator/src/org/vadere/simulator/entrypoints/Version.java # VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeSequential.java
# Conflicts: # VadereSimulator/src/org/vadere/simulator/entrypoints/Version.java # VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeSequential.java