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

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

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

diff --cc js/libs/fluidbook/menu/fluidbook.index.js
index 92edd851ff1e3b2c9f77464f9e73a48c4fc02039,0b454eeb2cb75233da0a534649f713744b1f699c..91943f386e22920430c991a1993dfe58a0345bd5
--- 1/js/libs/fluidbook/menu/fluidbook.index.js
--- 2/js/libs/fluidbook/menu/fluidbook.index.js
+++ b/js/libs/fluidbook/menu/fluidbook.index.js
@@@ -22,8 -22,40 +22,40 @@@ FluidbookIndex.prototype = 
          return this.fluidbook.bookmarks.getIndex(true, group);
      },
  
+     preloadThumbs: function (callback) {
+         this.fluidbook.loader.preloadThumbs(callback);
+     },
+ 
+     openIndex: function (title, group, closeAll, callback) {
+         var $this = this;
+         this.fluidbook.displayLoader();
+         this.preloadThumbs(function () {
+             $this._openIndex(title, group, closeAll, callback);
+         });
+     },
+ 
+     _openIndex: function (title, group, closeAll, callback) {
+         var c = !closeAll ? ' one' : '';
+         var index = '<div class="caption">' + this.fluidbook.menu.closeButton(c) + '<h2>' + title + '</h2></div>';
+         index += this.getView(group);
+         $("#view").append('<div class="mview" data-menu="index">' + index + '</div>');
+         // Mark current page
+         var cp = this.fluidbook.currentPage;
+ 
+         if (!this.fluidbook.singleMode) {
+             if (cp % 2 === 1) {
+                 cp--;
+             }
+         }
+         $("#view").find('.doubleThumb[page="' + cp + '"]').addClass('here');
+         this.fluidbook.bookmarks.updateBookmarks();
+         if (callback != undefined) {
+             callback();
+         }
+     },
+ 
      getNormalView: function () {
 -        if (this.normalHTML == '') {
 +        if (this.normalHTML === '') {
              this.normalHTML += '<div class="content"><div id="indexView">';
  
              if (this.fluidbook.datas.indexMessage !== '') {

diff --cc style/fluidbook.less
Simple merge