Merge branch 'feature-contacts' into develop

Conflicts:
	webapp/admin.py
	webapp/models.py
	webapp/views.py

webapp/migrations/0036_auto_20180301_2011.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-03-01 18:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0035_auto_20171019_1413'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Committee',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='role',
+            name='committee',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='roles', to='webapp.Committee'),
+        ),
+    ]

webapp/migrations/0037_auto_20180301_2111.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-03-01 19:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0036_auto_20180301_2011'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='committee',
+            options={'verbose_name': 'Committee', 'verbose_name_plural': 'Committees'},
+        ),
+    ]

webapp/migrations/0038_auto_20180516_2108.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 18:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0037_auto_20180301_2111'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='baserole',
+            name='category',
+        ),
+        migrations.RemoveField(
+            model_name='role',
+            name='committee',
+        ),
+        migrations.AddField(
+            model_name='official',
+            name='committee',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='roles', to='webapp.Committee'),
+        ),
+        migrations.AlterField(
+            model_name='role',
+            name='official',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='roles', to='webapp.Official'),
+        ),
+    ]

webapp/migrations/0039_auto_20180516_2113.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 18:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0038_auto_20180516_2108'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='official',
+            name='committee',
+        ),
+        migrations.RemoveField(
+            model_name='role',
+            name='official',
+        ),
+        migrations.AddField(
+            model_name='official',
+            name='role',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='roles', to='webapp.Role'),
+        ),
+        migrations.AddField(
+            model_name='role',
+            name='committee',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='roles', to='webapp.Committee'),
+        ),
+        migrations.AlterField(
+            model_name='committee',
+            name='name',
+            field=models.CharField(max_length=255, verbose_name='Name'),
+        ),
+    ]

webapp/migrations/0040_auto_20180516_2124.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 18:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0039_auto_20180516_2113'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='official',
+            name='role',
+        ),
+        migrations.AddField(
+            model_name='official',
+            name='role',
+            field=models.ManyToManyField(null=True, related_name='roles', to='webapp.Role'),
+        ),
+    ]

webapp/migrations/0041_auto_20180516_2204.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 19:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0040_auto_20180516_2124'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='official',
+            name='role',
+            field=models.ManyToManyField(related_name='official', to='webapp.Role'),
+        ),
+    ]

webapp/migrations/0042_merge_20180516_2249.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 19:49
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0041_auto_20180516_2204'),
+        ('webapp', '0041_delete_ohlhafvchallenge'),
+    ]
+
+    operations = [
+    ]