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

# Conflicts:
#	_index.html
#	js/libs/fluidbook/fluidbook.js
#	js/libs/fluidbook/fluidbook.loader.js

diff --cc _index.html
Simple merge

diff --cc js/libs/fluidbook/fluidbook.js
index 3990d2da6cfd19ac863204d166715ae4c68e3df9,02dc460349d9a528ca9371fe7b6eacf7564f83a7..7587bf7a242171b735125431bd23d8293c80deb2
--- 1/js/libs/fluidbook/fluidbook.js
--- 2/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -90,8 -90,12 +90,13 @@@ Fluidbook.prototype = 
          }
          $('html').addClass(this.datas.mobileLVersion);
          this.currentPage = -1;
+         this.maxPage = this.datas.pages;
+         if (this.datas.maxPages > 0) {
+             this.maxPage = Math.min(this.datas.maxPages, this.datas.pages);
+         }
+ 
          this.resize = new FluidbookResize(this);
 +        this.pagetransitions = new FluidbookPageTransition(this);
          this.stats = new FluidbookStats(this);
          this.stats.track(10);
  
@@@ -332,9 -365,13 +366,9 @@@
              if (isNaN(page) || page == undefined) {
                  return this.setCurrentPage('1');
              }
 -            if (this.pad.enabled) {
 -                this.transitionAxis = this.pad.getTransitionAxis(this.currentPage, page);
 -            } else {
 -                this.transitionAxis = 'x';
 -            }
 +
              if (page != $this.currentPage) {
-                 $($this).trigger('changePage', [page]);
+                 $($this).trigger('fluidbook.page.navigation', [page]);
              }
              if (this.landingpage !== undefined) {
                  this.landingpage.hide();

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

diff --cc js/libs/fluidbook/fluidbook.loader.js
index 73c6f6fe9318ec96efe80c13682cd27d063fb54d,724df37df84680652f650c40abc4289df9743ef1..266717532dbc63f6ab4cd55f4730370c6af0946e
--- 1/js/libs/fluidbook/fluidbook.loader.js
--- 2/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@@ -31,10 -30,20 +31,11 @@@ FluidbookLoader.prototype = 
  
          var $callback = callback;
          var $page = $pages.shift();
+         if ($page > this.fluidbook.getMaxPage() || $page < 1) {
 +
 +        this._preloadPage($page, function () {
              $this.preloadPagesBeforeTransition($pages, $callback);
 -            return;
 -        }
 -        this._loadBackground($page, function () {
 -            if ($this.getVersionToLoad($page) == 'textasvector') {
 -                $this._loadTexts($page, function () {
 -                    $this.preloadPagesBeforeTransition($pages, $callback);
 -                });
 -            } else {
 -                $this.preloadPagesBeforeTransition($pages, $callback);
 -            }
          });
 -
      },
  
      arePreloadedPages: function (pages) {

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

diff --cc style/fluidbook.less
Simple merge