Merge branch 'develop' of gitlab.lrz.de:vadere/vadere into develop
# Conflicts: # VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_PSO.scenario
# Conflicts: # VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_PSO.scenario