Merge branch 'master' into 73-add-rules-and-permissions

# Conflicts:
#	aleksis/apps/alsijil/menus.py
#	aleksis/apps/alsijil/models.py
#	aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
#	aleksis/apps/alsijil/views.py