Merge branch 'develop' into feature/statistic/backend

# Conflicts:
#	access_controller/urls.py
#	main/forms.py
#	main/views.py

main/migrations/0005_auto_20210302_2255.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.1.6 on 2021-03-02 19:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0004_rolechangelogs'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='userprofile',
+            options={'permissions': [('admin', 'Have access to control page')]},
+        ),
+    ]

main/migrations/0006_delete_userprofile.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.1.6 on 2021-03-03 19:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0005_auto_20210302_2255'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='UserProfile',
+        ),
+    ]

main/migrations/0007_userprofile.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.1.6 on 2021-03-03 19:35
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('main', '0006_delete_userprofile'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserProfile',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('role', models.CharField(default='None', max_length=100)),
+                ('image', models.URLField(blank=True, null=True)),
+                ('name', models.CharField(default='None', max_length=100)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'permissions': [('control_access', 'User has access to control page')],
+            },
+        ),
+    ]

main/migrations/0008_auto_20210303_2305.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.1.6 on 2021-03-03 20:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0007_userprofile'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='userprofile',
+            options={},
+        ),
+    ]