Merge branch 'kontakt_modify' of gitlab.ethz.ch:amiv/amiv-website into kontakt_modify

3 jobs for kontakt_modify in 17 minutes and 12 seconds (queued for 1 second)