Merge branch 'master' into single_config
# Conflicts: # VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java # VadereGui/src/org/vadere/gui/postvisualization/utils/MovRecorder.java # VadereGui/src/org/vadere/gui/projectview/view/ProjectView.java # pom.xml