Merge remote-tracking branch 'origin/new_lms_dev(critical)' into new_lms_dev(critical)

# Conflicts:
#	access/views.py

access/migrations/0004_auto_20180129_0933.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-01-29 09:33
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('access', '0003_useractivity'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='progress',
+            unique_together=set([]),
+        ),
+        migrations.RemoveField(
+            model_name='progress',
+            name='teacher',
+        ),
+        migrations.RemoveField(
+            model_name='progress',
+            name='user',
+        ),
+        migrations.AlterUniqueTogether(
+            name='progresslesson',
+            unique_together=set([]),
+        ),
+        migrations.RemoveField(
+            model_name='progresslesson',
+            name='progress',
+        ),
+        migrations.RemoveField(
+            model_name='progresslesson',
+            name='teacher',
+        ),
+        migrations.DeleteModel(
+            name='Progress',
+        ),
+        migrations.DeleteModel(
+            name='ProgressLesson',
+        ),
+    ]