Merge branch 'biscuit-merge' into 'master'

aleksis/apps/chronos/fallback_view.py

aleksis/apps/chronos/forms.py

aleksis/apps/chronos/m2l.py

aleksis/apps/chronos/menus.py

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

...sis/apps/chronos/migrations/0005_remove_school_related.py

aleksis/apps/chronos/migrations/0006_extended_data.py

aleksis/apps/chronos/model_extensions.py

aleksis/apps/chronos/models.py

aleksis/apps/chronos/pdf.py

aleksis/apps/chronos/settings.py

aleksis/apps/chronos/static/css/chronos/timetable.css

aleksis/apps/chronos/static/js/chronos/date_select.js

aleksis/apps/chronos/static/js/chronos/week_select.js

aleksis/apps/chronos/tables.py

aleksis/apps/chronos/templates/chronos/all.html

...sis/apps/chronos/templates/chronos/edit_substitution.html

aleksis/apps/chronos/templates/chronos/hint_form.html

aleksis/apps/chronos/templates/chronos/hints.html

aleksis/apps/chronos/templates/chronos/lessons_day.html