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

aleksis/apps/alsijil/templates/alsijil/extra_mark/create.html

+	{# -*- engine:django -*- #}
+
+	{% extends "core/base.html" %}
+	{% load material_form i18n %}
+
+	{% block browser_title %}{% blocktrans %}Create extra mark{% endblocktrans %}{% endblock %}
+	{% block page_title %}{% blocktrans %}Create extra mark{% endblocktrans %}{% endblock %}
+
+	{% block content %}
+
+	  <form method="post">
+	    {% csrf_token %}
+	    {% form form=form %}{% endform %}
+	    {% include "core/partials/save_button.html" %}
+	  </form>
+
+	{% endblock %}