Merging FR changes and Admin2 changes

Author: szabozoltan69

api/migrations/0160_merge_0159_auto_20221022_1542_0159_auto_20221028_0940.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.2.16 on 2022-11-01 10:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0159_auto_20221022_1542'),
+        ('api', '0159_auto_20221028_0940'),
+    ]
+
+    operations = [
+    ]