Merge branch 'news' of https://github.com/Pentabyteman/SaS into news

web_dev/sas_web/templates/public/header.html

@@ -34,7 +34,7 @@
     <div id="navigation">
     <ul class="navbar">
         <li class ="navbar"><a {% if appname == "startpage" %}class="active"{% endif %} href="/">Information</a></li>
-        <li class ="navbar"><a {% if appname == "news" %}class="active"{% endif %} href="{% url "news:index" %}">News</a></li>
+        <li class ="navbar"><a {% if appname == "news" %}class="active"{% endif %} href="{% url "news:index" %}">Wahl '18</a></li>
         <li class="navbar"><a {% if appname == "datenbank" %}class="active"{% endif %} href="{% url "datenbank:index" %}">Datenbank</a></li>
         <li class="navbar"><a {% if appname == "meingoethopia" %}class="active"{% endif %} href="{% url "meingoethopia:index" %}">Mein Goethopia</a></li>         
     </ul>