# Conflicts:
#	requirements.txt
#	schoolapps/dashboard/urls.py
#	schoolapps/dashboard/views.py
#	schoolapps/helper.py
#	schoolapps/timetable/views.py
#	schoolapps/untisconnect/parse.py
#	schoolapps/untisconnect/plan.py

- Check "show_plan" permission in dashboard

- Do some refactoring

# Conflicts:
#	schoolapps/dashboard/views.py
#	schoolapps/static/common/style.css
#	schoolapps/templates/partials/footer.html
#	schoolapps/timetable/views.py

- Disable "My status" and "Exams"
- Add beta notice
- Add fallback view to dashboard urls
- Add excepts for network operations
- Comment and refactor

# Conflicts:
#	schoolapps/dashboard/views.py
#	schoolapps/timetable/views.py
#	schoolapps/untisconnect/api.py
#	schoolapps/untisconnect/plan.py

- Comment, refactor and document cache system

# Conflicts:
#	schoolapps/templates/partials/footer.html

Bugfix/no mobile smartplan

# Conflicts:
#	schoolapps/templates/partials/footer.html

Feature/summarize hour blocks #287

Bugfix/absence.is whole day #291

inspect hast du vermutlich nur zu Testzwecken verwendet

Apply merging of sub rows for HTML table, too | Refactor and comment | Add __eq__ to API objects to improve matching

add two funtions equal() and merge_subs() to summarise lessons with same attributes, there's some tidying up to do

Feature/skip parallel courses #285

two simple changes

rename class to aktuell in generate_pdf, exclude flags b (Verfügungsstunde) and F (Lehrerfrei) in get_substituitions_by_date

Add extra REBUS categories (issue #279) 

From friday 15:35 the smart plan shows the next week (issue #271)

all 'class.pdf' renamed to 'aktuell.pdf'