Merge branch 'master' of gitup.uni-potsdam.de:nifranz/rse-23-group-assignment-shervud-pitawanik-franz