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

# Conflicts:
#	js/libs/fluidbook/fluidbook.links.js

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

diff --cc js/libs/fluidbook/fluidbook.links.js
index be52923e794ee0744809275f6440d48c0b6a4bb0,64a751e92662d3d2e7256f1351a2da1a5fe8ec46..7e45f9f06f3308c4276484ba679001fb48fc2727
--- 1/js/libs/fluidbook/fluidbook.links.js
--- 2/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@@ -78,8 -75,10 +75,9 @@@ FluidbookLinks.prototype = 
  
  
          $(document).on('click touchend', '[data-action]', function () {
 -
 -            var map = {'pdf': 'print', 'fullScreen': "fullscreen", 'locales': 'localesContainers'};
 +            var map = {'pdf': 'print', 'fullScreen': "fullscreen", 'locales': 'localesContainers', 'basket': 'cart'};
              var action = $(this).data('action');
+             var extra = $(this).data('extra');
              if (action == 'share') {
                  // Let share class handle this
                  return true;

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

diff --cc js/libs/fluidbook/fluidbook.nav.js
index 1769bd1e30ff4692e0b2c5afa4312dd841ac3505,3ea67a1e6d623e4283bdcaf66ab95bd2cc636af4..dec0297ac7e77cd12a3574baf631ee272004fe15
--- 1/js/libs/fluidbook/fluidbook.nav.js
--- 2/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@@ -322,7 -331,9 +331,8 @@@ FluidbookNav.prototype = 
              var link2 = null;
  
              if (icon == 'home' && !skipHome) {
 -
                  var homeURL = this.fluidbook.datas.home;
+                 var homeRequireLoader = true;
                  if (this.fluidbook.datas.home == '%apphome%' || forceHome && DATAS.phonegap) {
                      homeURL = decodeURIComponent(window.localStorage.getItem('apphome'));
                  }

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

diff --cc style/fluidbook.less
Simple merge