Merge branch 'master' of https://gitlab.lrz.de/vadere/vadere

2 jobs for master in 76 minutes and 6 seconds (queued for 2 seconds)