Merge branch 'dev' into 'master'

Dev

See merge request !23

courses/migrations/0002_auto_20180218_1910.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-02-18 19:10
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='topic',
+            options={'ordering': ('sort',), 'verbose_name': 'Тема', 'verbose_name_plural': 'Темы'},
+        ),
+    ]

courses/models.py

@@ -63,6 +63,7 @@ class Topic(models.Model):
     class Meta:
         verbose_name = "Тема"
         verbose_name_plural = "Темы"
+        ordering = ('sort',)
 
 
 class CourseManager(models.Manager):