Merge remote-tracking branch 'origin/ticket/r13706-doofinder-badgateway'

into develop

Conflicts:
	themes/toutpratique/product-list.tpl

modules/antadis_doofinder/lib/doofinder_api.php

@@ -152,7 +152,8 @@ class DoofinderApi{
     private function reqHeaders(){
         $headers = array();
         $headers[] = 'Expect:'; //Fixes the HTTP/1.1 417 Expectation Failed
-        $authHeaderName = $this->apiVersion == '4' ? 'API Token: ' : 'authorization: ';
+        //$authHeaderName = $this->apiVersion == '4' ? 'API Token: ' : 'Authorization: ';
+        $authHeaderName = 'Authorization: ';
         $headers[] = $authHeaderName . $this->api_key; //API Authorization
         return $headers;
     }

modules/antadis_doofinder/lib/doofinder_management_api.php

@@ -83,7 +83,7 @@ class DoofinderManagementApi{
 
         return $return;
     }
-²
+
     function getApiRoot() {
         /**
          * To get info on all possible api entry points

themes/toutpratique/product-list.tpl

@@ -20,7 +20,6 @@
 					<!-- Image -->
 					<div class="row">
 						<div class="{if !isset($column)}col-sm-4 {else} col-sm-5 {/if}wrapImg">
-
 							{if $percentReduction}
 								<span class="price-percent-reduction">
 									{if isset($product.isflash) && $product.isflash}<span class="blink">{/if}