Attempt to merge master into task/3747/multiple_cards_support

hosting/templates/hosting/includes/_footer.html

@@ -1,5 +1,5 @@
-{% load staticfiles %}
 {% load i18n %}
+
 <footer>
     <div class="container">
         <div class="row">
@@ -26,7 +26,7 @@
                         <a href="#contact">Contact</a>
                     </li>
                 </ul>
-                <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
+                <p class="copyright text-muted small">Copyright &copy; ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
             </div>
         </div>
     </div>

hosting/templates/hosting/includes/_header.html

@@ -7,7 +7,6 @@
             <div class="col-lg-12">
 
                 <div class="intro-message">
-                <img class="responsive" src="{% static 'hosting/img/Beta.png' %}">
                     <h1>{{ domain }}</h1>
                     <h3>{{ hosting_long }} as easy as possible</h3>
                     <hr class="intro-divider">

hosting/templates/hosting/includes/_navbar_user.html

@@ -1,9 +1,6 @@
-{% load staticfiles %}
-{% load i18n %}
-{% load custom_tags %}
+{% load staticfiles i18n custom_tags %}
 
 <!-- Navigation -->
-
 <nav class="navbar navbar-default navbar-fixed-top topnav" role="navigation">
     <div class="topnav">
         <!-- Brand and toggle get grouped for better mobile display -->