Merge remote-tracking branch 'origin/master' into 3dflip

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

diff --cc js/libs/fluidbook/fluidbook.nav.js
index 100417429329f2aed720d536de96d4f850c03ef0,e6c16a57800992f23e1befc30a3be000d53534ec..2092bae6120f3494fe685ef787870593f1742f17
--- 1/js/libs/fluidbook/fluidbook.nav.js
--- 2/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@@ -662,9 -655,38 +662,9 @@@ FluidbookNav.prototype = 
              $this.openSearch();
          });
  
 -
 -        if (this.fluidbook.support.fullscreen) {
 -            // Full screen toggle
 -            $(document).on('click', '.icon-fullscreen', function () {
 -                $this.menuAPI.close();
 -                screenfull.toggle();
 -                return false;
 -            });
 -
 -
 -            // Toggle icon on fullscreen change (also handles exiting via ESC key)
 -            screenfull.on('change', function () {
 -                resize();
 -                // Slight delay to stop icon state flickering during fullscreen transition
 -                setTimeout(function () {
 -                    if (screenfull.isFullscreen) {
 -                        $('.icon-fullscreen').addClass('active');
 -                    } else {
 -                        $('.icon-fullscreen').removeClass('active');
 -                    }
 -                    resize();
 -                }, 250);
 -
 -                setTimeout(function () {
 -                    resize();
 -                }, 1000);
 -            });
 -        }
 -
          // Share icon
          $(document).on('click', '.icon-share', function () {
-             if ($this.fluidbook.datas.phonegap != 'android') {
+             if ($this.fluidbook.datas.phonegap !== 'android') {
                  return true;
              }
              $this.fluidbook.share.intentShare();

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

diff --cc style/fluidbook.less
Simple merge