Merge branch 'master' into newmc

Conflicts:
	js/90-mobilenav.js

diff --cc js/90-mobilenav.js
index d66ebe48aec5a42f40352194b0ee5a7d41d6b376,ad354ac9f273932762a934a6de1b7aee78c74c03..cf0adfcdfc047b3dd25ac1814b0e85fecb407a87
--- 1/js/90-mobilenav.js
--- 2/js/90-mobilenav.js
+++ b/js/90-mobilenav.js
@@@ -6,7 -6,7 +6,7 @@@
                        return;
                $('#title').before('<div class="text-center">Tap title to toggle menu</div>');
                $('nav').addClass('hidden');
-               $('#title,#logo').css('margin', '6px').on('click', function () {
 -              $('#title').on('click', function () {
++              $('#title,#logo').on('click', function () {
                        $('nav').toggleClass('hidden');
                });
        });