Merge branch 'develop' of https://git.rwth-aachen.de/acs/public/cloud/mas/clonemap into webui

2 jobs for webui in 3 minutes and 27 seconds (queued for 1 second)