merge master and fixed migration conflict

ungleich_page/models.py

@@ -124,6 +124,27 @@ class UngleichHeader(CMSPlugin):
     carousel_data_interval = models.IntegerField(default=5000)
 
 
+class UngleichHeaderWithBackgroundImageSliderItem(CMSPlugin):
+    background_image = FilerImageField(
+        null=True, blank=True,
+        related_name="ungleich_header_slider_item_image",
+        on_delete=models.SET_NULL
+    )
+    description = HTMLField(
+        default='<div class="intro-cap">We  Design, Configure &amp; Maintain '
+                '<br>Your Linux Infrastructure</div><p class="intro_lead">'
+                'Ruby on Rails, Django, Java, Webserver, Mailserver, any '
+                'infrastructure that needs to configured, we provide '
+                'comprehensive solutions. Amazon, rackspace or bare metal '
+                'servers, we configure for you.</p><p style="text-align: '
+                'right;"><a class="btn btn-trans" href="">Learn More</a></p>'
+    )
+
+
+class UngleichHeaderWithBackgroundImageSlider(CMSPlugin):
+    carousel_data_interval = models.IntegerField(default=2000)
+
+
 class UngleichHeaderItem(CMSPlugin):
     image = FilerImageField(
         null=True,