Merge branch 'master' into burgermenu

diff --cc js/libs/fluidbook/fluidbook.help.js
Simple merge

diff --cc js/libs/fluidbook/fluidbook.nav.js
index 6f47acf3577187f828c1608b8fee6ac1bb0ade11,d0edb2796c4267dc5d042f90356c38ef07fbec72..bae9e671c36ed7be6dddbcd8e07f82e91b83d232
--- 1/js/libs/fluidbook/fluidbook.nav.js
--- 2/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@@ -269,15 -90,10 +269,15 @@@ FluidbookNav.prototype = 
              hide.push('chapters');
          }
  
 +        // If the locales icon is included, it should always be placed last in the list for formatting reasons
 +        // if ((localeIconIndex = loop.indexOf('lang')) !== -1) {
 +        //     loop.push(loop.splice(localeIconIndex, 1)[0]); // Push to end of array
 +        // }
 +
          for (var e in loop) {
              var icon = loop[e];
 -            var visible = hide.indexOf(icon) == -1;
 +            //var visible = hide.indexOf(icon) == -1;
-             var link;
+             var link = null;
  
              if (icon == 'home' && !skipHome) {