Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	digitalglarus/templates/digitalglarus/base.html

digitalglarus/templates/digitalglarus/base.html

@@ -64,7 +64,10 @@
 	    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 		<ul class="nav navbar-nav">
 		    <li>
-			<a href="{% url 'digitalglarus:index' %}">Home</a>
+		      <a href="{% url 'digitalglarus:letscowork' %}">Crowdfounding</a>
+		    </li>
+		    <li>
+			<a href="{% url 'digitalglarus:home' %}">Home</a>
 		    </li>
 		    <li>
 			<a href="{% url 'digitalglarus:about' %}">About</a>
@@ -72,9 +75,6 @@
 		    <li>
 			<a href="{% url 'digitalglarus:contact' %}">Contact</a>
 		    </li>
-		    <li>
-		      <a href="{% url 'digitalglarus:landing' %}">Crowdfunding</a>
-		    </li>
 		</ul>
 	    </div>
 	    <!-- /.navbar-collapse -->

digitalglarus/urls.py

@@ -6,5 +6,6 @@ urlpatterns = [
     url(r'^$', views.index, name='index'),
     url(r'about$', views.about, name='about'),
     url(r'contact$', views.contact, name='contact'),
-    url(r'landing$', views.landing, name='landing'),
+    url(r'letscowork$', views.letscowork, name='letscowork'),
+    url(r'home$', views.home, name='home'),
 ]

digitalglarus/views.py

@@ -23,11 +23,20 @@ def detail(request, message_id):
 def about(request):
     return render(request, 'digitalglarus/about.html')
 
+#def index(request):
+#    return render(request, 'digitalglarus/index.html')
+#
+#def letscowork(request):
+#    return render(request, 'digitalglarus/letscowork.html')
+
 def index(request):
+    return render(request, 'digitalglarus/letscowork.html')
+
+def home(request):
     return render(request, 'digitalglarus/index.html')
 
-def landing(request):
+def letscowork(request):
-    return render(request, 'digitalglarus/landing.html')
+    return render(request, 'digitalglarus/letscowork.html')
 
 def contact(request):
     message = Message(received_date=datetime.datetime.now())