Merge branch 'master' into burgermenu

diff --cc _index.html
Simple merge

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

diff --cc js/libs/fluidbook/fluidbook.menu.js
index 0b89d6c7d08d99a5d2d1e40694b48c9fd2b6b8ce,031de2e0a424e30472c58448dd374b165bc14ec9..d6352db22b648d00f2f4498c5dfc6e2bec941dc3
--- 1/js/libs/fluidbook/fluidbook.menu.js
--- 2/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@@ -5,9 -5,13 +5,12 @@@ function FluidbookMenu(fluidbook) 
  
  FluidbookMenu.prototype = {
      init: function () {
 -        this.index = new FluidbookIndex(this.fluidbook);
          var $this = this;
  
-         $(document).on('click', ".mview .back", function () {
+         // Note: iOS won't catch click events unless the element has a cursor:pointer style
+         // This was added for #viewOverlay in the CSS
+         // More details: https://stackoverflow.com/a/16006333
+         $(document).on('click', ".mview .back, #viewOverlay", function () {
              var currentHash = window.location.hash;
              window.location.hash = '/page/' + $this.fluidbook.currentPage;
              if (window.location.hash == currentHash) {

diff --cc style/fluidbook.less
index a363a0212331b19da94c1614b901bdfebcf2b5d7,00b5955a700e325ed66f4e4003f403ee61ee5b1f..5447ac690ae219590117956fc17f6b4f2556c1b5
--- 1/style/fluidbook.less
--- 2/style/fluidbook.less
+++ b/style/fluidbook.less
@@@ -1194,39 -1219,17 +1226,18 @@@ form input[type="text"], form input[typ
  
  }
  
- /* Search */
- .highlight0 {
-       background-color: #00ff00;
- }
- 
- .highlight1 {
-       background-color: #ffff00;
- }
- 
- .highlight2 {
-       background-color: #00ffff;
- }
- 
- .highlight3 {
-       background-color: #ff00ff;
- }
- 
- .highlight4 {
-       background-color: #ff0000;
- }
- 
  /* Share */
  
 -ul.chapters.shareList a.level0 img {
 +ul.chapters.shareList a.level0 .svg-icon {
        height: 25px;
 -      margin: 2px 10px 0 0;
 -      position: relative;
 -      top: 3px;
 -}
 +      width: 25px;
 +      display: inline-block;
 +      vertical-align: middle;
 +      margin: 0 10px 6px 0;
  
 -.rtl ul.chapters.shareList a.level0 img {
 -      margin: 2px 0 0 10px;
 +      .rtl & {
 +              margin: 0 0 6px 10px;
 +      }
  }
  
  /* Help */