Merge branch 'dev' into feature/top-box-sub

biscuit/apps/chronos/pdf.py

biscuit/apps/chronos/templates/timetable/all.html

biscuit/apps/chronos/templates/timetable/datepicker.html

biscuit/apps/chronos/templates/timetable/lesson.html

biscuit/apps/chronos/templates/timetable/myplan.html

biscuit/apps/chronos/templates/timetable/plan.html

biscuit/apps/chronos/templates/timetable/quicklaunch.html

biscuit/apps/chronos/templates/timetable/substitution.html

biscuit/apps/chronos/tests.py

biscuit/apps/chronos/urls.py

biscuit/apps/chronos/views.py