Merge in some migrations from master

InvenTree/build/migrations/0008_merge_20180417_2307.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-04-17 13:07
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('build', '0004_auto_20180417_2127'),
+        ('build', '0007_auto_20180417_1025'),
+    ]
+
+    operations = [
+    ]