Merge branch 'master' into newmc

diff --combined js/90-mobilenav.js
index cf0adfcdfc047b3dd25ac1814b0e85fecb407a87,f8774214d5109fbab11460017dd1ab799bf2368b..abba03e4fd3be93830be82d3d9b081513680f5f2
--- 1/js/90-mobilenav.js
--- 2/js/90-mobilenav.js
+++ b/js/90-mobilenav.js
@@@ -2,11 -2,11 +2,11 @@@
        'use strict';
  
        $( document ).ready(function(){
-               if(document.body.clientWidth >= 768)
+               if(window.innerWidth >= 768)
                        return;
                $('#title').before('<div class="text-center">Tap title to toggle menu</div>');
                $('nav').addClass('hidden');
 -              $('#title').on('click', function () {
 +              $('#title,#logo').on('click', function () {
                        $('nav').toggleClass('hidden');
                });
        });