Merge branch 'dev' of gitlab.kiv.zcu.cz:aswi/aswi-2021/aswi2021codebakers into feature/coding_dashboard
Conflicts: src/app/dashboard/components/dashboard.component.html
Merge branch 'dev' of gitlab.kiv.zcu.cz:aswi/aswi-2021/aswi2021codebakers into feature/coding_dashboard