Merge branch 'master' into 266-add-statistics-page-for-absences

# Conflicts:
#	aleksis/apps/alsijil/frontend/index.js
#	aleksis/apps/alsijil/model_extensions.py