Merge remote-tracking branch 'origin/master' into printing

diff --cc js/libs/fluidbook/fluidbook.js
index 80a259bdb244454d6807c986fe1f4cecd759e5e8,bbcaae572112aaa7d259a0dbd77fcb5d0c005461..f21e106748abe1bb63bbcab8f14af7722467b383
--- 1/js/libs/fluidbook/fluidbook.js
--- 2/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -55,9 -61,7 +61,8 @@@ Fluidbook.prototype = 
          this.audiodescription = new FluidbookAudioDescription(this);
          this.sound = new FluidbookSound(this);
          this.slideshow = new FluidbookSlideshow(this);
 +        this.printing = new FluidbookPrint(this);
  
- 
          if (this.datas.basket) {
              this.cart = new FluidbookCart(this);
          }

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

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

diff --cc style/fluidbook.less
index 3753797118fa2c9502a496131b1752ab5a82009b,81f2bb0f677126b2510588235a6516b005dc7815..25429ac07d645002892d6c0bdc69e13a13fd022c
--- 1/style/fluidbook.less
--- 2/style/fluidbook.less
+++ b/style/fluidbook.less
@@@ -2932,6 -3092,12 +3092,14 @@@ body > input 
        }
  }
  
 +@import "print.less";
 +
  @import "additional.less";
+ 
+ #pscanvas {
+       visibility: hidden;
+ }
+ 
+ #loadedcontents {
+       display: none;
+ }