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

diff --cc js/libs/fluidbook/fluidbook.js
index 04cc781edd54cb21d3ad4ca88a991df93b1e10c7,7f2fa5ee7c98f376fb321f40f1f2f76dc2db4f30..0963add8e53c87c25e240493256473d0c96fb493
--- 1/js/libs/fluidbook/fluidbook.js
--- 2/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -54,12 -56,11 +56,13 @@@ Fluidbook.prototype = 
          this.tooltip = new FluidbookTooltip(this);
          this.audiodescription = new FluidbookAudioDescription(this);
          this.sound = new FluidbookSound(this);
-         this.cart =new FluidbookCart(this);
- 
+         if(this.datas.basket) {
+             this.cart = new FluidbookCart(this);
+         }
          if (this.datas.form == 'bulle') {
              this.form = new FluidbookBulleForm(this);
 +        } else if (this.datas.form == 'bourbon') {
 +            this.form = new FluidbookBourbonForm(this);
          } else {
              this.form == false;
          }