Merge branch 'develop' of gitlab.lrz.de:vadere/vadere into develop

2 jobs for develop in 1 minute and 59 seconds (queued for 1 second)