Merge branch 'master' into html5video

diff --cc _index.html
index 9a3dff1ccb8558d7646d8a4f2cd58042d8f09694,ff0481a87abd17d26fedc210fd6e22c6206ba981..8cfd2bdcb61549f5041a56afa9cc926d45b9d1ac
--- 1/_index.html
--- 2/_index.html
+++ b/_index.html
@@@ -8,9 -8,9 +8,9 @@@
        <meta charset="utf-8">
        <meta http-equiv="X-UA-Compatible" content="IE=Edge">
        <meta http-equiv="Content-Security-Policy"
 -            content="default-src * gap://ready file:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.google-analytics.com; img-src * data:">
 +            content="default-src * gap://ready file:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.google-analytics.com *.youtube.com *.ytimg.com; img-src * data:">
        <!--<meta name="apple-mobile-web-app-capable" content="yes">-->
-       <meta name="viewport" content="initial-scale=1,minimum-scale=1">
+       <meta name="viewport" content="initial-scale=1,minimum-scale=1,user-scalable=no">
        <meta name="google" content="notranslate">
        <!-- $description -->
        <!-- $style -->

diff --cc js/libs/fluidbook/fluidbook.links.js
index ee62c2f63017b37886455a6b15c465ee96f27115,17efc1a01e82d1b1f1666a5d460c3b74fcc7c16f..085b21b23ee6bd0d62c9d69599eb37cbffbe80b0
--- 1/js/libs/fluidbook/fluidbook.links.js
--- 2/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@@ -59,10 -60,11 +60,12 @@@ FluidbookLinks.prototype = 
          $("#links").prepend('<a href="#" class="nonlinkarea"></a>');
          var $this = this;
          if (this.fluidbook.datas.linkBlinkTime > 0 && this.fluidbook.datas.mobileLinksRevealAnim) {
-             this.animateLinks();
+             setTimeout(function () {
+                 $this.animateLinks();
+             }, 1000);
          }
          setTimeout(function () {
 +            console.info('initVideos called from fluidbook.links');
              $this.fluidbook.initVideos();
          }, 1000);
          $(fluidbook).trigger('fluidbooklinksready');

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

diff --cc style/fluidbook.css
Simple merge

diff --cc style/fluidbook.less
Simple merge