Merge branch 'master' into translations

biscuit/apps/alsijil/templates/alsijil/lesson.html

@@ -52,7 +52,7 @@
        <th>{% blocktrans %}Remarks{% endblocktrans %}</th>
       </tr>
       {% for form in personal_note_formset %}
-       {% form.id %}
+       {{ form.id }}
        <tr>
         <td>{{ form.person_name }}</td>
         <td>{{ form.absent }}</td>