Merge branch 'feature/holidays' into dev

# Conflicts:
#	.idea/dataSources.local.xml
#	schoolapps/static/common/style.css
#	schoolapps/timetable/templates/timetable/plan.html
#	schoolapps/timetable/views.py
#	schoolapps/untisconnect/plan.py