Merge branch 'master' into develop

cms_templates/home_digitalglarus.html

@@ -2,31 +2,11 @@
 {% load staticfiles cms_tags %}
 
 {% block content %}
+
 <div class="row">
   <div class="box">
+	{% placeholder 'digitalglarus_gallery' %} 
     <div class="col-lg-12 text-center">
-      <div id="carousel-example-generic" class="carousel slide">
-	<!-- Indicators --><!-- Wrapper for slides -->
-	<div class="carousel-inner">
-	  <div class="item active">
-	    <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-1.jpg' %}" alt="">
-	  </div>
-	  <div class="item">
-	    <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-2.jpg' %}" alt="">
-	  </div>
-	  <div class="item">
-	    <img class="img-responsive img-full" src="{% static 'digitalglarus/img/slide-3.jpg' %}" alt="">
-	  </div>
-	</div>
-
-	<!-- Controls -->
-	<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
-	  <span class="icon-prev"></span>
-	</a>
-	<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
-	  <span class="icon-next"></span>
-	</a>
-      </div>
       <h2 class="brand-before">
 	<small>WELCOME TO</small>
       </h2>
@@ -96,4 +76,4 @@
   </div>
 </div>
 
-{% endblock %}
+{% endblock %}

dynamicweb/settings/prod.py

@@ -1,7 +1,5 @@
 from .base import *
 
-DEBUG = False
-
 ADMINS = (
     ('Nico Schottelius', 'nico.schottelius@ungleich.ch'),
     ('Raul Ascencio', 'raul.ascencio@yandex.com'),