Merge branch 'master' into bug/3418/calc_errmsg_position

Changelog

@@ -1,3 +1,11 @@
+1.0.18: 2017-07-02
+    * [datacenterlight] Introduced the new flow. Landing page -> Payment -> Order confirmation -> Success
+    * [datacenterlight] Fixed issue showing local time to the user in order confirmation page, vm pages (like ssh keys)
+    * [hosting] Fixed responsive issue while user signup
+    * [hosting] Fixed 500 error when user requests for a vm whose id does not belong to him
+    * [datacenterlight] Refactored partially dcl text and dcl support email to be obtained from env parameters
+    * [datacenterlight] Updated DE translations
+    * [hosting] Updated email text for user activation
 1.0.17: 2017-06-16
     * [datacenterlight] Cleanup OrderView useless code
     * [datacenterlight] Replaced GiB to GB
@@ -5,7 +13,7 @@
     * [datacenterlight] Fixed translations
     * [datacenterlight] Added email confirmation feature
     * [datacenterlight] Changed logo on datacerlight dashboard
-    * [datacenterlight] Credit card input disappearance fix 
+    * [datacenterlight] Credit card input disappearance fix
 1.0.16: 2017-06-15
     * [datacenterlight] .po file issue with multiple definition fixed
     * [datacenterlight] Navbar items in dcl user area rearranged

hosting/templates/hosting/base_short.html

@@ -131,6 +131,8 @@
             <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
         </div>
     </footer>
+    {% else %}
+        {% include "datacenterlight/includes/_footer.html" %}
     {% endif %}
     <!-- jQuery -->
     <script src="{% static 'hosting/js/jquery.js' %}"></script>