Merge branch 'develop' into 'main'

Makefile

docker-compose.yml

src/app/app.routes.ts

src/app/shared/services/progress-service.ts

src/app/views/quiz/quiz-endpage/quiz-endpage.component.ts

src/app/views/quiz/quiz-homepage/quiz-homepage.component.ts