Merge branch 'nohac-7958,7998,8001,8010,8012' of https://gitlab.kiv.zcu.cz/aswi/aswi-2020/aswi2020merlot into nohac-7958,7998,8001,8010,8012
Merge branch 'nohac-7958,7998,8001,8010,8012' of https://gitlab.kiv.zcu.cz/aswi/aswi-2020/aswi2020merlot into nohac-7958,7998,8001,8010,8012