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

diff --cc js/libs/fluidbook/fluidbook.js
index bca1f26c4c1f9a358ab2e2db2f8eca5447d059a5,1725c316af2334fb7dc4a13ddb58ec6642a0bcf6..7f885a6e5b6ed4bdf51d99544f21bfa4a71d0bd6
--- 1/js/libs/fluidbook/fluidbook.js
--- 2/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -96,9 -96,9 +96,10 @@@ Fluidbook.prototype = 
          }
  
          this.resize = new FluidbookResize(this);
 +        this.pagetransitions = new FluidbookPageTransition(this);
          this.stats = new FluidbookStats(this);
          this.stats.track(10);
+         this.flags = {};
  
          this.initTheme();
          this.initKeyboardShortcuts();
@@@ -373,9 -377,9 +374,9 @@@
              if (this.landingpage !== undefined) {
                  this.landingpage.hide();
              }
-             this.menu.closeView(function () {
+             this.menu._closeView(function () {
                  if (page != $this.currentPage) {
 -                    $this.pageTransition(page);
 +                    $this.pagetransitions.pageTransition(page);
                      $this.stats.track(0, page);
                  }
                  $this.zoom.resetZoom();