Merge branch 'develop' into hotfix/ticket_unassignment

# Conflicts:
#	main/models.py

main/migrations/0012_auto_20210312_1225.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.1.6 on 2021-03-12 09:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0011_auto_20210311_1734'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='custom_role_id',
+            field=models.IntegerField(default=0, help_text='Код роли пользователя'),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='role',
+            field=models.CharField(default='None', help_text='Глобальное имя роли пользователя', max_length=100),
+        ),
+    ]