Merge branch 'master' into 154-my-students-students-lists-aren-t-sorted-alphabetically

aleksis/apps/alsijil/migrations/0001_initial.py

aleksis/apps/alsijil/migrations/0002_excuse_type.py

aleksis/apps/alsijil/migrations/0003_extra_mark.py

aleksis/apps/alsijil/migrations/0008_global_permissions.py

aleksis/apps/alsijil/migrations/0010_events_extra_lessons.py

...apps/alsijil/templates/alsijil/class_register/lesson.html

...s/alsijil/templates/alsijil/class_register/week_view.html

aleksis/apps/alsijil/util/alsijil_helpers.py

aleksis/apps/alsijil/views.py

poetry.lock