Merge branch 'master' of https://transfer.hft-stuttgart.de/gitlab/ugl/website into master

2 jobs for master in 22 seconds (queued for 3 seconds)