Merge branch 'dev' into 'main'
Final merge after first semester
See merge request aswi/aswi-2023/aswi2023one-team-to-rule-them-all!11
Merge branch 'dev' into 'main'
Final merge after first semester
See merge request aswi/aswi-2023/aswi2023one-team-to-rule-them-all!11