diff --git a/server/assignments/migrations/0001_initial.py b/server/assignments/migrations/0001_initial.py
index fc3e66e4..08e7d87c 100644
--- a/server/assignments/migrations/0001_initial.py
+++ b/server/assignments/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-10 08:25
+# Generated by Django 2.0.6 on 2018-10-11 13:45
 
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/server/assignments/migrations/0002_auto_20181010_0825.py b/server/assignments/migrations/0002_auto_20181011_1345.py
similarity index 95%
rename from server/assignments/migrations/0002_auto_20181010_0825.py
rename to server/assignments/migrations/0002_auto_20181011_1345.py
index 57d58e1e..e990f22a 100644
--- a/server/assignments/migrations/0002_auto_20181010_0825.py
+++ b/server/assignments/migrations/0002_auto_20181011_1345.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-10 08:25
+# Generated by Django 2.0.6 on 2018-10-11 13:45
 
 from django.conf import settings
 from django.db import migrations, models
@@ -10,9 +10,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('books', '0001_initial'),
         ('assignments', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
diff --git a/server/books/migrations/0001_initial.py b/server/books/migrations/0001_initial.py
index a7fcb076..7dbe8218 100644
--- a/server/books/migrations/0001_initial.py
+++ b/server/books/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-10 08:25
+# Generated by Django 2.0.6 on 2018-10-11 13:45
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('wagtailimages', '0021_image_file_hash'),
         ('wagtailcore', '0040_page_draft_title'),
+        ('wagtailimages', '0021_image_file_hash'),
     ]
 
     operations = [
diff --git a/server/books/migrations/0002_auto_20181010_0825.py b/server/books/migrations/0002_auto_20181011_1345.py
similarity index 93%
rename from server/books/migrations/0002_auto_20181010_0825.py
rename to server/books/migrations/0002_auto_20181011_1345.py
index d73d6047..9a5cf6fb 100644
--- a/server/books/migrations/0002_auto_20181010_0825.py
+++ b/server/books/migrations/0002_auto_20181011_1345.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-10 08:25
+# Generated by Django 2.0.6 on 2018-10-11 13:45
 
 from django.db import migrations, models
 
diff --git a/server/objectives/migrations/0001_initial.py b/server/objectives/migrations/0001_initial.py
index fe5bf89d..3e83b9ab 100644
--- a/server/objectives/migrations/0001_initial.py
+++ b/server/objectives/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-10 08:25
+# Generated by Django 2.0.6 on 2018-10-11 13:45
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -39,7 +39,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('done', models.BooleanField(default=False, verbose_name='Lernziel erledigt?')),
-                ('objective', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='objectives.Objective')),
+                ('objective', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='objective_progress', to='objectives.Objective')),
             ],
             options={
                 'verbose_name': 'Lernzielstatus',
diff --git a/server/objectives/migrations/0002_auto_20181010_0825.py b/server/objectives/migrations/0002_auto_20181011_1345.py
similarity index 87%
rename from server/objectives/migrations/0002_auto_20181010_0825.py
rename to server/objectives/migrations/0002_auto_20181011_1345.py
index b0db0864..3e6e7c57 100644
--- a/server/objectives/migrations/0002_auto_20181010_0825.py
+++ b/server/objectives/migrations/0002_auto_20181011_1345.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-10 08:25
+# Generated by Django 2.0.6 on 2018-10-11 13:45
 
 from django.conf import settings
 from django.db import migrations, models
@@ -11,8 +11,8 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('objectives', '0001_initial'),
+        ('books', '0002_auto_20181011_1345'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('books', '0002_auto_20181010_0825'),
     ]
 
     operations = [
@@ -34,6 +34,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='objective',
             name='group',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='objectives.ObjectiveGroup'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='objectives', to='objectives.ObjectiveGroup'),
         ),
     ]
diff --git a/server/rooms/migrations/0001_initial.py b/server/rooms/migrations/0001_initial.py
index 3aebe9e4..02a8e9b5 100644
--- a/server/rooms/migrations/0001_initial.py
+++ b/server/rooms/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-10 08:25
+# Generated by Django 2.0.6 on 2018-10-11 13:45
 
 from django.db import migrations, models
 import django_extensions.db.fields
diff --git a/server/rooms/migrations/0002_auto_20181010_0825.py b/server/rooms/migrations/0002_auto_20181011_1345.py
similarity index 95%
rename from server/rooms/migrations/0002_auto_20181010_0825.py
rename to server/rooms/migrations/0002_auto_20181011_1345.py
index 2a4b2a0b..8c617e80 100644
--- a/server/rooms/migrations/0002_auto_20181010_0825.py
+++ b/server/rooms/migrations/0002_auto_20181011_1345.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-10 08:25
+# Generated by Django 2.0.6 on 2018-10-11 13:45
 
 from django.conf import settings
 from django.db import migrations, models
@@ -10,8 +10,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('users', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('rooms', '0001_initial'),
     ]
 
diff --git a/server/users/migrations/0001_initial.py b/server/users/migrations/0001_initial.py
index 4d13507b..e2c6d96b 100644
--- a/server/users/migrations/0001_initial.py
+++ b/server/users/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-10-10 08:25
+# Generated by Django 2.0.6 on 2018-10-11 13:45
 
 from django.conf import settings
 import django.contrib.auth.models