Merge branch 'master' into 82-do-not-count-cancelled-lessons

.gitignore

aleksis/apps/alsijil/forms.py

aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po

aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po

aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po

aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po

aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po

aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po

aleksis/apps/alsijil/menus.py

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

aleksis/apps/alsijil/migrations/0004_group_notes.py

aleksis/apps/alsijil/migrations/0005_groups_of_person.py

...s/alsijil/migrations/0006_delete_personal_notes_filter.py

aleksis/apps/alsijil/model_extensions.py

aleksis/apps/alsijil/models.py

aleksis/apps/alsijil/static/css/alsijil/lesson.css

aleksis/apps/alsijil/tables.py

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

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

...sis/apps/alsijil/templates/alsijil/extra_mark/create.html