Merge branch 'frontend-devel' of https://gitlab.inf.unibz.it/Roland.Bernard/wie_202021_csbillero11 into frontend-devel