[#144] Adds merge migrations and missing 1.14 migration.

I'm not sure how that got missed in the last hydroshare migration, but
it did.

hs_core/migrations/0038_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hs_core', '0036_remove_baseresource_comments_count'),
+        ('hs_core', '0037_auto_20180209_0309'),
+    ]
+
+    operations = [
+    ]

theme/migrations/0008_auto_20170622_2141.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('theme', '0007_auto_20170427_1553'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userquota',
+            name='allocated_value',
+            field=models.FloatField(default=20),
+        ),
+        migrations.AlterField(
+            model_name='userquota',
+            name='used_value',
+            field=models.FloatField(default=0),
+        ),
+    ]

theme/migrations/0015_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('theme', '0014_comma_semicolon_delimiter'),
+        ('theme', '0009_auto_20180322_1459'),
+    ]
+
+    operations = [
+    ]