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

1 job for develop in 50 seconds (queued for 2 seconds)