diff --git a/modules/blockcart/blockcart.css b/modules/blockcart/blockcart.css
index 12d708f56..863e4b6fe 100644
--- a/modules/blockcart/blockcart.css
+++ b/modules/blockcart/blockcart.css
@@ -78,7 +78,7 @@
 #cart_block #cart_block_total {
 	float:right
 }
-#cart_block #cart_block_shipping_cost {font-weight:normal}
+#cart_block #cart_block_shipping_cost {font-weight:bold}
 
 #cart_block #cart-buttons .button_small {display:none;}
 #cart_block #cart-buttons  #button_order_cart {
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index 914fc3f1d..73967d749 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -32,8 +32,8 @@
 var CUSTOMIZE_TEXTFIELD = {$CUSTOMIZE_TEXTFIELD};
 var customizationIdMessage = '{l s='Customization #' mod='blockcart' js=1}';
 var removingLinkText = '{l s='remove this product from my cart' mod='blockcart' js=1}';
-var freeShippingTranslation = '<b>{l s='Free shipping!' mod='blockcart' js=1}</b>';
-var freeProductTranslation = '<b>{l s='Free!' mod='blockcart' js=1}</b>';
+var freeShippingTranslation = '{l s='Free shipping!' mod='blockcart' js=1}';
+var freeProductTranslation = '{l s='Free!' mod='blockcart' js=1}';
 var delete_txt = '{l s='Delete' mod='blockcart'}';
 var img_dir = '{$img_dir}';
 </script>
@@ -106,10 +106,9 @@ var img_dir = '{$img_dir}';
 		</dl>
 	{/if}
 		<p {if $products}class="hidden"{/if} id="cart_block_no_products">{l s='No products' mod='blockcart'}</p>
-
+	{if $discounts|@count > 0}
 		<table id="vouchers">
 			<tbody>
-				{if $discounts|@count > 0}
 					{foreach from=$discounts item=discount}
 						{if $discount.value_real > 0}
 						<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
@@ -120,10 +119,10 @@ var img_dir = '{$img_dir}';
 						</tr>
 						{/if}
 					{/foreach}
-				{/if}
 			</tbody>
 		</table>
-
+		{/if}
+		
 		<p id="cart-prices">
 			<span id="cart_block_shipping_cost" class="price ajax_cart_shipping_cost">{$shipping_cost}</span>
 			<span>{l s='Shipping' mod='blockcart'}</span>
diff --git a/modules/blockcontact/blockcontact.tpl b/modules/blockcontact/blockcontact.tpl
index a9e4a866d..9895a2ae0 100644
--- a/modules/blockcontact/blockcontact.tpl
+++ b/modules/blockcontact/blockcontact.tpl
@@ -30,6 +30,5 @@
 			<p>{l s='Our hotline' mod='blockcontact'}<br />{l s='is available 24/7' mod='blockcontact'}</p>
 			{if $telnumber != ''}<p class="tel">{l s='Phone:' mod='blockcontact'}{$telnumber}</p>{/if}
 			{if $email != ''}<a href="mailto:{$email}">{l s='Contact' mod='blockcontact'}<br/> {l s='our hotline' mod='blockcontact'}</a>{/if}
-		</form>
 	</div>
 </div>
diff --git a/modules/blockreinsurance/blockreinsurance.tpl b/modules/blockreinsurance/blockreinsurance.tpl
index 129805e25..c4192ea93 100644
--- a/modules/blockreinsurance/blockreinsurance.tpl
+++ b/modules/blockreinsurance/blockreinsurance.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
+{if $infos|@count > 0}
 <!-- MODULE Block reinsurance -->
 <div id="reinsurance_block" class="clearfix">
 	<ul class="width{$nbblocks}">	
@@ -32,4 +32,5 @@
 		{/foreach}
 	</ul>
 </div>
-<!-- /MODULE Block reinsurance -->
\ No newline at end of file
+<!-- /MODULE Block reinsurance -->
+{/if}
\ No newline at end of file
diff --git a/modules/blocksharefb/blocksharefb.tpl b/modules/blocksharefb/blocksharefb.tpl
index 38bc1426e..93b4276ab 100644
--- a/modules/blocksharefb/blocksharefb.tpl
+++ b/modules/blocksharefb/blocksharefb.tpl
@@ -25,5 +25,5 @@
 *}
 
 <li id="left_share_fb">
-	<a href="http://www.facebook.com/sharer.php?u={$product_link}&t={$product_title}" target="blank">{l s='Share on Facebook' mod='blocksharefb'}</a>
+	<a href="http://www.facebook.com/sharer.php?u={$product_link}&amp;t={$product_title}" class="js-new-window">{l s='Share on Facebook' mod='blocksharefb'}</a>
 </li>
\ No newline at end of file
diff --git a/modules/favoriteproducts/config.xml b/modules/favoriteproducts/config.xml
index 804006593..b392abd75 100644
--- a/modules/favoriteproducts/config.xml
+++ b/modules/favoriteproducts/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
         <module>
             <name>favoriteproducts</name>
-            <displayName><![CDATA[Favorite Products]]></displayName>
+            <displayName><![CDATA[Produits favoris]]></displayName>
             <version><![CDATA[1]]></version>
-            <description><![CDATA[Display a page with the favorite products of the customer]]></description>
+            <description><![CDATA[Affiche une page avec les produits favoris de l&#039;utilisateur]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[front_office_features]]></tab>
             <is_configurable>0</is_configurable>
diff --git a/modules/favoriteproducts/favoriteproducts.php b/modules/favoriteproducts/favoriteproducts.php
index d77cd0b99..e65c04c15 100644
--- a/modules/favoriteproducts/favoriteproducts.php
+++ b/modules/favoriteproducts/favoriteproducts.php
@@ -50,6 +50,7 @@ class FavoriteProducts extends Module
 				|| !$this->registerHook('displayMyAccountBlock')
 				|| !$this->registerHook('displayCustomerAccount')
 				|| !$this->registerHook('displayLeftColumnProduct')
+				|| !$this->registerHook('extraLeft')
 				|| !$this->registerHook('displayHeader'))
 					return false;
 
diff --git a/modules/homeslider/homeslider.tpl b/modules/homeslider/homeslider.tpl
index ea175f613..33d7db553 100644
--- a/modules/homeslider/homeslider.tpl
+++ b/modules/homeslider/homeslider.tpl
@@ -44,7 +44,7 @@
 <ul id="homeslider">
 {foreach from=$homeslider_slides item=slide}
 	{if $slide.active}
-		<li><a href="{$slide.url}" title="{$slide.description}"><img src="{$smarty.const._MODULE_DIR_}/homeslider/images/{$slide.image}" alt="{$slide.legend}" title="{$slide.description}" height="{$homeslider.height}" width="{$homeslider.width}"></a></li>
+		<li><a href="{$slide.url}" title="{$slide.description}"><img src="{$smarty.const._MODULE_DIR_}/homeslider/images/{$slide.image}" alt="{$slide.legend}" title="{$slide.description}" height="{$homeslider.height}" width="{$homeslider.width}" /></a></li>
 	{/if}
 {/foreach}
 </ul>
diff --git a/themes/default/js/tools.js b/themes/default/js/tools.js
index 84c64c482..681e1f453 100644
--- a/themes/default/js/tools.js
+++ b/themes/default/js/tools.js
@@ -238,4 +238,13 @@ $(document).ready(function() {
 			$(this).attr('eventCheckboxChange', true);
 		}
 	}
+});
+
+
+// Use it to simulate target blank link
+$(function(){
+    $('a.js-new-window').click(function(){
+        window.open(this.href);
+        return false;
+    });
 });
\ No newline at end of file
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index 27994f90a..ce79029d5 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -299,7 +299,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 									{/if}
 									{/foreach}
 								</ul>
-								<input type="hidden" id="color_pick_hidden" name="{$groupName}" value="{$default_colorpicker}" >
+								<input type="hidden" id="color_pick_hidden" name="{$groupName}" value="{$default_colorpicker}" />
 							{elseif ($group.group_type == 'radio')}
 								{foreach from=$group.attributes key=id_attribute item=group_attribute}
 									<input type="radio" class="attribute_radio" name="{$groupName}" value="{$id_attribute}" {if ($group.default == $id_attribute)} checked="checked"{/if} onclick="findCombination();getProductAttribute();{if $colors|@count > 0}$('#wrapResetImages').show('slow');{/if}">