diff --git a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
index 070a110d1..c56ce4471 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
@@ -3,11 +3,11 @@
 	<div class="input-group col-lg-2">
 		<span class="switch prestashop-switch">
 			<input type="radio" name="free_shipping" id="free_shipping_on" value="1" {if $currentTab->getFieldValue($currentObject, 'free_shipping')|intval}checked="checked"{/if} />
-			<label class="t radio" for="free_shipping_on">
+			<label class="t" for="free_shipping_on">
 				<i class="icon-check-sign color_success"></i> {l s='Yes'}
 			</label>
 			<input type="radio" name="free_shipping" id="free_shipping_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'free_shipping')|intval}checked="checked"{/if} />
-			<label class="t radio" for="free_shipping_off">
+			<label class="t" for="free_shipping_off">
 				<i class="icon-ban-circle color_danger"></i> {l s='No'}
 			</label>
 			<a class="slide-button btn btn-default"></a>
@@ -116,11 +116,11 @@
 	<div class="input-group col-lg-2">
 		<span class="switch prestashop-switch">
 			<input type="radio" name="free_gift" id="free_gift_on" value="1" {if $currentTab->getFieldValue($currentObject, 'gift_product')|intval}checked="checked"{/if} />
-			<label class="t radio" for="free_gift_on">
+			<label class="t" for="free_gift_on">
 				<i class="icon-check-sign color_success"></i> {l s='Yes'}
 			</label>
 			<input type="radio" name="free_gift" id="free_gift_off" value="0" {if !$currentTab->getFieldValue($currentObject, 'gift_product')|intval}checked="checked"{/if} />
-			<label class="t radio" for="free_gift_off">
+			<label class="t" for="free_gift_off">
 				<i class="icon-ban-circle color_danger"></i> {l s='No'}
 			</label>
 			<a class="slide-button btn btn-default"></a>
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
index c6589b36a..1b7474805 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
@@ -295,7 +295,6 @@
 					</tr>
 				</table>
 			</div>
-		</div>
 		{/if}
 	</div>
 </div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
index 9bb1bf040..7c19b7707 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
@@ -70,9 +70,9 @@
 	<div class="input-group col-lg-2">
 		<span class="switch prestashop-switch">
 			<input type="radio" name="highlight" id="highlight_on" value="1" {if $currentTab->getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if}/>
-			<label class="t radio" for="highlight_on"><i class="icon-check-sign color_success"></i> {l s='Yes'}</label>
+			<label class="t" for="highlight_on"><i class="icon-check-sign color_success"></i> {l s='Yes'}</label>
 			<input type="radio" name="highlight" id="highlight_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if} />
-			<label class="t radio" for="highlight_off"><i class="icon-ban-circle color_danger"></i> {l s='No'}</label>
+			<label class="t" for="highlight_off"><i class="icon-ban-circle color_danger"></i> {l s='No'}</label>
 			<a class="slide-button btn btn-default"></a>
 		</span>
 	</div>
@@ -89,9 +89,9 @@
 	<div class="input-group col-lg-2">
 		<span class="switch prestashop-switch">
 			<input type="radio" name="partial_use" id="partial_use_on" value="1" {if $currentTab->getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} />
-			<label class="t radio" for="partial_use_on"><i class="icon-check-sign color_success"></i> {l s='Yes'}</label>
+			<label class="t" for="partial_use_on"><i class="icon-check-sign color_success"></i> {l s='Yes'}</label>
 			<input type="radio" name="partial_use" id="partial_use_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} />
-			<label class="t radio" for="partial_use_off"><i class="icon-ban-circle color_danger"></i> {l s='No'}</label>
+			<label class="t" for="partial_use_off"><i class="icon-ban-circle color_danger"></i> {l s='No'}</label>
 			<a class="slide-button btn btn-default"></a>
 		</span>
 	</div>
@@ -114,9 +114,9 @@
 	<div class="input-group col-lg-2">
 		<span class="switch prestashop-switch">
 			<input type="radio" name="active" id="active_on" value="1" {if $currentTab->getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} />
-			<label class="t radio" for="active_on"><i class="icon-check-sign color_success"></i> {l s='Yes'}</label>
+			<label class="t" for="active_on"><i class="icon-check-sign color_success"></i> {l s='Yes'}</label>
 			<input type="radio" name="active" id="active_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} />
-			<label class="t radio" for="active_off"><i class="icon-ban-circle color_danger"></i> {l s='No'}</label>
+			<label class="t" for="active_off"><i class="icon-ban-circle color_danger"></i> {l s='No'}</label>
 			<a class="slide-button btn btn-default"></a>
 		</span>
 	</div>
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
index 5d12784e8..d0847c234 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
@@ -19,7 +19,7 @@
 			</div>
 		</div>
 	</td>
-	<td>
+	<td class="text-right">
 		<a class="btn btn-default" href="javascript:removeProductRule({$product_rule_group_id|intval}, {$product_rule_id|intval});">
 			<i class="icon-remove"></i>
 		</a>
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl
index b1c6d5c83..bb83283db 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl
@@ -1,26 +1,28 @@
-<div class="col-lg-6">
-	{l s='Unselected'}
-	<select multiple id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_1">
-		{foreach from=$product_rule_itemlist.unselected item='item'}
-			<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
-		{/foreach}
-	</select>
-	<a id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add" class="btn btn-default btn-block" >
-		{l s='Add'}
-		<i class="icon-arrow-right"></i>
-	</a>
-</div>
-<div class="col-lg-6">
-	{l s='Selected'}
-	<select multiple name="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}[]" id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_2" class="product_rule_toselect" >
-		{foreach from=$product_rule_itemlist.selected item='item'}
-			<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
-		{/foreach}
-	</select>
-	<a id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove" class="btn btn-default btn-block" >
-		<i class="icon-arrow-left"></i>
-		{l s='Remove'}
-	</a>
+<div class="col-lg-12 bootstrap">
+	<div class="col-lg-6">
+		{l s='Unselected'}
+		<select multiple id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_1">
+			{foreach from=$product_rule_itemlist.unselected item='item'}
+				<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
+			{/foreach}
+		</select>
+		<a id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add" class="btn btn-default btn-block" >
+			{l s='Add'}
+			<i class="icon-arrow-right"></i>
+		</a>
+	</div>
+	<div class="col-lg-6">
+		{l s='Selected'}
+		<select multiple name="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}[]" id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_2" class="product_rule_toselect" >
+			{foreach from=$product_rule_itemlist.selected item='item'}
+				<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
+			{/foreach}
+		</select>
+		<a id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove" class="btn btn-default btn-block" >
+			<i class="icon-arrow-left"></i>
+			{l s='Remove'}
+		</a>
+	</div>
 </div>
 			
 <script type="text/javascript">
diff --git a/admin-dev/themes/default/template/footer_toolbar.tpl b/admin-dev/themes/default/template/footer_toolbar.tpl
index bae785f6b..3d7843af9 100644
--- a/admin-dev/themes/default/template/footer_toolbar.tpl
+++ b/admin-dev/themes/default/template/footer_toolbar.tpl
@@ -80,6 +80,9 @@
 							return false;
 						submited = true;
 
+						if ($(this).attr('href').replace('#', '').replace(/\s/g, '') != '')
+							return true;
+
 						//add hidden input to emulate submit button click when posting the form -> field name posted
 						btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
 
@@ -90,6 +93,9 @@
 					if (btn_save_and_stay)
 					{
 						btn_save_and_stay.click(function() {
+							if ($(this).attr('href').replace('#', '').replace(/\s/g, '') != '')
+								return true;
+
 							//add hidden input to emulate submit button click when posting the form -> field name posted
 							btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
 
diff --git a/classes/Cookie.php b/classes/Cookie.php
index 8d358c6be..7da2ba990 100644
--- a/classes/Cookie.php
+++ b/classes/Cookie.php
@@ -270,7 +270,10 @@ class CookieCore
 			//printf("\$content = %s<br />", $content);
 			
 			/* Get cookie checksum */
-			$checksum = crc32($this->_salt.substr($content, 0, strrpos($content, '¤') + 2));
+			$tmpTab = explode('¤', $content);
+			array_pop($tmpTab);
+			$content_for_checksum = implode('¤', $tmpTab).'¤';
+			$checksum = crc32($this->_salt.$content_for_checksum);
 			//printf("\$checksum = %s<br />", $checksum);
 			
 			/* Unserialize cookie content */
diff --git a/controllers/admin/AdminOutstandingController.php b/controllers/admin/AdminOutstandingController.php
index 357b8249f..7e00853ab 100644
--- a/controllers/admin/AdminOutstandingController.php
+++ b/controllers/admin/AdminOutstandingController.php
@@ -28,6 +28,7 @@ class AdminOutstandingControllerCore  extends AdminController
 {
 	public function __construct()
 	{
+		$this->bootstrap = true;
 	 	$this->table = 'order_invoice';
 		$this->className = 'OrderInvoice';
 		$this->addRowAction('view');
@@ -51,13 +52,10 @@ class AdminOutstandingControllerCore  extends AdminController
 
 		$this->fields_list = array(
 			'number' => array(
-				'title' => $this->l('Invoice Number'),
-				'align' => 'center',
-				'width' => 20
+				'title' => $this->l('Invoice')
  			),
 			'date_add' => array(
 				'title' => $this->l('Date'),
-				'width' => 150,
 				'type' => 'date',
 				'align' => 'right',
 				'filter_key' => 'a!date_add'
@@ -69,13 +67,11 @@ class AdminOutstandingControllerCore  extends AdminController
  			),
 			'company' => array(
 				'title' => $this->l('Company'),
-				'align' => 'center',
-				'width' => 20
+				'align' => 'center'
  			),
 			'risk' => array(
 				'title' => $this->l('Risk'),
 				'align' => 'center',
-				'width' => 100,
 				'orderby' => false,
 				'type' => 'select',
 				'color' => 'color',
@@ -86,7 +82,6 @@ class AdminOutstandingControllerCore  extends AdminController
 			'outstanding_allow_amount' => array(
 				'title' => $this->l('Outstanding Allow'),
 				'align' => 'center',
-				'width' => 50,
 				'prefix' => '<b>',
 				'suffix' => '</b>',
 				'type' => 'price'
@@ -94,14 +89,12 @@ class AdminOutstandingControllerCore  extends AdminController
 			'outstanding' => array(
 				'title' => $this->l('Current Outstanding'),
 				'align' => 'center',
-				'width' => 50,
 				'callback' => 'printOutstandingCalculation',
 				'orderby' => false,
 				'search' => false
  			),
 			'id_invoice' => array(
-				'title' => $this->l('PDF'),
-				'width' => 35,
+				'title' => $this->l('Invoice'),
 				'align' => 'center',
 				'callback' => 'printPDFIcons',
 				'orderby' => false,
@@ -148,7 +141,7 @@ class AdminOutstandingControllerCore  extends AdminController
 		if (!Validate::isLoadedObject($order_invoice))
 			throw new PrestaShopException('object Customer can\'t be loaded');
 
-		return '<b>'.$customer->getOutstanding().'</b>';
+		return '<b>'.Tools::displayPrice($customer->getOutstanding(), Context::getContext()->currency).'</b>';
 	}
 
 	/**
diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php
index b577d004c..c3859d401 100644
--- a/controllers/admin/AdminTaxRulesGroupController.php
+++ b/controllers/admin/AdminTaxRulesGroupController.php
@@ -334,11 +334,6 @@ class AdminTaxRulesGroupControllerCore extends AdminController
 					'label' => $this->l('Description:'),
 					'name' => 'description',
 				)
-			),
-			'submit' => array(
-				'title' => $this->l('Save and stay'),
-				'class' => 'btn btn-default',
-				'stay' => true
 			)
 		);
 
@@ -365,8 +360,8 @@ class AdminTaxRulesGroupControllerCore extends AdminController
 		$helper->default_form_language = $this->default_form_language;
 		$helper->allow_employee_form_lang = $this->allow_employee_form_lang;
 		$helper->fields_value = $this->getFieldsValue($this->object);
-		$helper->toolbar_btn['save'] = array(
-			'href' => self::$currentIndex.'&amp;id_tax_rules_group='.$obj->id.'&amp;updatetax_rules_group&amp;token='.$this->token,
+		$helper->toolbar_btn['save_new_rule'] = array(
+			'href' => self::$currentIndex.'&amp;id_tax_rules_group='.$obj->id.'&amp;action=create_rule&amp;token='.$this->token,
 			'desc' => 'Save tax rule',
 			'class' => 'process-icon-save'
 		);
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 97c3bd5ac..2a983da43 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -530,27 +530,26 @@ class ProductControllerCore extends FrontController
 	{
 		// Assign category to the template
 		if ($this->category !== false && Validate::isLoadedObject($this->category) && $this->category->inShop() && $this->category->isAssociatedToShop())
-		{
 			$path = Tools::getPath($this->category->id, $this->product->name, true);
-			$this->context->smarty->assign(array(
-				'category' => $this->category,
-				'subCategories' => $this->category->getSubCategories($this->context->language->id, true),
-				'id_category_current' => (int)$this->category->id,
-				'id_category_parent' => (int)$this->category->id_parent,
-				'return_category_name' => Tools::safeOutput($this->category->name)
-			));
-		}
 		elseif (Category::inShopStatic($this->product->id_category_default, $this->context->shop))
 		{
-			$cat_default = new Category((int)$this->product->id_category_default);
-			if (Validate::isLoadedObject($cat_default) && $cat_default->active && $cat_default->isAssociatedToShop())
+			$this->category = new Category((int)$this->product->id_category_default);
+			if (Validate::isLoadedObject( $this->category) &&  $this->category->active &&  $this->category->isAssociatedToShop())
 				$path = Tools::getPath((int)$this->product->id_category_default, $this->product->name);
 		}
 		if (!isset($path) || !$path)
 			$path = Tools::getPath((int)$this->context->shop->id_category, $this->product->name);
-		$this->context->smarty->assign('path', $path);
 		
-		$this->context->smarty->assign('categories', Category::getHomeCategories($this->context->language->id, true, (int)$this->context->shop->id));
+		// various assignements before Hook::exec
+		$this->context->smarty->assign(array(
+			'path' => $path,
+			'category' => $this->category,
+			'subCategories' => $this->category->getSubCategories($this->context->language->id, true),
+			'id_category_current' => (int)$this->category->id,
+			'id_category_parent' => (int)$this->category->id_parent,
+			'return_category_name' => Tools::safeOutput($this->category->name),
+			'categories' => Category::getHomeCategories($this->context->language->id, true, (int)$this->context->shop->id)
+		));
 		$this->context->smarty->assign(array('HOOK_PRODUCT_FOOTER' => Hook::exec('displayFooterProduct', array('product' => $this->product, 'category' => $this->category))));
 	}
 
diff --git a/img/logo.jpg b/img/logo.jpg
index 3ef612536..47c933e39 100644
Binary files a/img/logo.jpg and b/img/logo.jpg differ
diff --git a/modules/blockbanner/blockbanner.tpl b/modules/blockbanner/blockbanner.tpl
index 460a41a89..9604d6c1a 100644
--- a/modules/blockbanner/blockbanner.tpl
+++ b/modules/blockbanner/blockbanner.tpl
@@ -29,7 +29,7 @@
 	<div class="container">
 	  <a href="{$banner_link}" title="{$banner_desc}">
 		{if isset($banner_img)}
-			<img class="img-responsive" src="{$module_dir}{$banner_img}" alt=""/>
+			<img class="img-responsive" src="{$module_dir}{$banner_img}" alt="{$banner_desc}" title="{$banner_desc}"/>
 		{else}
 			{$banner_desc}
 		{/if}
diff --git a/modules/blockcategories/category-tree-branch.tpl b/modules/blockcategories/category-tree-branch.tpl
index f0d945c23..a0d13c820 100644
--- a/modules/blockcategories/category-tree-branch.tpl
+++ b/modules/blockcategories/category-tree-branch.tpl
@@ -25,7 +25,7 @@
 
 <li class="category_{$node.id}{if isset($last) && $last == 'true'} last{/if}">
 	<a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
-		title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
+		title="{$node.desc|strip_tags|trim|truncate:255:'...'|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
 	{if $node.children|@count > 0}
 		<ul>
 		{foreach from=$node.children item=child name=categoryTreeBranch}
diff --git a/modules/themeconfigurator/views/templates/admin/items.tpl b/modules/themeconfigurator/views/templates/admin/items.tpl
index 8cd6e246f..a6a997ddf 100644
--- a/modules/themeconfigurator/views/templates/admin/items.tpl
+++ b/modules/themeconfigurator/views/templates/admin/items.tpl
@@ -15,7 +15,7 @@
                 {foreach name=items from=$hookItems item=hItem}
                     <li id="item-{$hItem.id_item}" class="item panel">
                         <span class="item-order">{if $hItem.item_order le 9}0{/if}{$hItem.item_order}</span>
-                        <!--<i class="icon-sort"></i>-->
+                        {if $hItem.image}<span><img src="{$module_dir}images/{$hItem.image}" alt="" title="" class="preview" /></span>{/if}
                         <span class="item-title">{$hItem.title}</span>
                         <span class="button btn btn-default button-edit pull-right"><i class="icon-edit"></i>{l s='Edit' mod='themeconfigurator'}</span>
                         <span class="button btn btn-default button-close pull-right"><i class="icon-remove"></i>{l s='Close' mod='themeconfigurator'}</span>
diff --git a/themes/default-bootstrap/addresses.tpl b/themes/default-bootstrap/addresses.tpl
index 8779feea7..5866c8370 100644
--- a/themes/default-bootstrap/addresses.tpl
+++ b/themes/default-bootstrap/addresses.tpl
@@ -23,58 +23,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{*
-** Retro compatibility for PrestaShop version < 1.4.2.5 with a recent theme
-*}
-
-{* Two variable are necessaries to display the address with the new layout system *}
-{* Will be deleted for 1.5 version and more *}
-{if !isset($multipleAddresses)}
-	{$ignoreList.0 = "id_address"}
-	{$ignoreList.1 = "id_country"}
-	{$ignoreList.2 = "id_state"}
-	{$ignoreList.3 = "id_customer"}
-	{$ignoreList.4 = "id_manufacturer"}
-	{$ignoreList.5 = "id_supplier"}
-	{$ignoreList.6 = "date_add"}
-	{$ignoreList.7 = "date_upd"}
-	{$ignoreList.8 = "active"}
-	{$ignoreList.9 = "deleted"}
-
-	{* PrestaShop < 1.4.2 compatibility *}
-	{if isset($addresses)}
-		{$address_number = 0}
-		{foreach from=$addresses key=k item=address}
-			{counter start=0 skip=1 assign=address_key_number}
-			{foreach from=$address key=address_key item=address_content}
-				{if !in_array($address_key, $ignoreList)}
-					{$multipleAddresses.$address_number.ordered.$address_key_number = $address_key}
-					{$multipleAddresses.$address_number.formated.$address_key = $address_content}
-					{counter}
-				{/if}
-			{/foreach}
-		{$multipleAddresses.$address_number.object = $address}
-		{$address_number = $address_number  + 1}
-		{/foreach}
-	{/if}
-{/if}
-
-{* Define the style if it doesn't exist in the PrestaShop version*}
-{* Will be deleted for 1.5 version and more *}
-{if !isset($addresses_style)}
-	{$addresses_style.company = 'address_company'}
-	{$addresses_style.vat_number = 'address_company'}
-	{$addresses_style.firstname = 'address_name'}
-	{$addresses_style.lastname = 'address_name'}
-	{$addresses_style.address1 = 'address_address1'}
-	{$addresses_style.address2 = 'address_address2'}
-	{$addresses_style.city = 'address_city'}
-	{$addresses_style.country = 'address_country'}
-	{$addresses_style.phone = 'address_phone'}
-	{$addresses_style.phone_mobile = 'address_phone_mobile'}
-	{$addresses_style.alias = 'address_title'}
-{/if}
-
 <script type="text/javascript">
 //<![CDATA[
 	{literal}
diff --git a/themes/default-bootstrap/authentication.tpl b/themes/default-bootstrap/authentication.tpl
index 56d75a82c..24e23c000 100644
--- a/themes/default-bootstrap/authentication.tpl
+++ b/themes/default-bootstrap/authentication.tpl
@@ -82,9 +82,6 @@ $(document).ready(function() {
 	<script type="text/javascript">
 	{literal}
 	$(document).ready(function(){
-		// Retrocompatibility with 1.4
-		if (typeof baseUri === "undefined" && typeof baseDir !== "undefined")
-		baseUri = baseDir;
 		$('#create-account_form').submit(function(){
 			submitFunction();
 			return false;
diff --git a/themes/default-bootstrap/css/global.css b/themes/default-bootstrap/css/global.css
index 09df5efba..14dfa0ca2 100644
--- a/themes/default-bootstrap/css/global.css
+++ b/themes/default-bootstrap/css/global.css
@@ -2405,6 +2405,64 @@ a.price_discount_delete:hover {
   background: white;
 }
 
+@media (max-width: 767px) {
+  #order-detail-content #cart_summary table, #order-detail-content #cart_summary thead, #order-detail-content #cart_summary tbody, #order-detail-content #cart_summary th, #order-detail-content #cart_summary td, #order-detail-content #cart_summary tr {
+    display: block;
+  }
+  #order-detail-content #cart_summary thead tr {
+    position: absolute;
+    top: -9999px;
+    left: -9999px;
+  }
+  #order-detail-content #cart_summary tr {
+    border-bottom: 1px solid #ccc;
+    overflow: hidden;
+  }
+  #order-detail-content #cart_summary td {
+    border: none;
+    position: relative;
+    width: 50%;
+    float: left;
+    white-space: normal;
+  }
+  #order-detail-content #cart_summary td.cart_avail {
+    clear: both;
+  }
+  #order-detail-content #cart_summary td.cart_quantity {
+    clear: both;
+    padding: 9px 8px 11px 18px;
+  }
+  #order-detail-content #cart_summary td.cart_delete {
+    width: 100%;
+    clear: both;
+    text-align: right;
+  }
+  #order-detail-content #cart_summary td.cart_delete:before {
+    display: inline-block;
+    padding-right: 0.5em;
+    position: relative;
+    top: -3px;
+  }
+  #order-detail-content #cart_summary td.cart_delete div {
+    display: inline;
+  }
+  #order-detail-content #cart_summary td:before {
+    content: attr(data-title);
+    display: block;
+  }
+  #order-detail-content #cart_summary tfoot td {
+    float: none;
+    width: 100%;
+  }
+  #order-detail-content #cart_summary tfoot td:before {
+    display: inline;
+  }
+  #order-detail-content #cart_summary tfoot tr .text-right, #order-detail-content #cart_summary tfoot tr .price {
+    display: block;
+    float: left;
+    width: 50%;
+  }
+}
 .cart_voucher {
   vertical-align: top !important;
 }
@@ -3451,3 +3509,10 @@ div.star.star_hover:after {
 .ie8 #facebook_block, .ie8 #cmsinfo_block {
   height: 344px;
 }
+
+/************************* Zoom ******************************/
+@media (max-width: 1199px) {
+  .zoomdiv {
+    display: none !important;
+  }
+}
diff --git a/themes/default-bootstrap/css/product.css b/themes/default-bootstrap/css/product.css
index e3b5d8e73..dc496628b 100644
--- a/themes/default-bootstrap/css/product.css
+++ b/themes/default-bootstrap/css/product.css
@@ -569,8 +569,15 @@ span.view_scroll_spacer {
     display: none;
   }
 }
-.box-info-product .exclusive.disabled:before {
+.box-info-product .exclusive.added:before {
+  content: "";
+}
+.box-info-product .exclusive.added.disabled:before, .box-info-product .exclusive.disabled:before {
   content: "";
+  animation: 2s linear 0s normal none infinite spin;
+  -webkit-animation: 2s linear 0s normal none infinite spin;
+  -moz-animation: 2s linear 0s normal none infinite spin;
+  border: none;
 }
 .box-info-product .exclusive:after {
   background: url(../img/border-1.gif) repeat-y 0 0;
diff --git a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
index dfbceb697..63e198425 100644
--- a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
+++ b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
@@ -176,8 +176,15 @@ var ajaxCart = {
 		ajaxCart.updateCart(jsonData);
 		
 		//reactive the button when adding has finished
-		if (addedFromProductPage)
+		if (addedFromProductPage) {
 			$('#add_to_cart button').removeAttr('disabled').removeClass('disabled');
+			if (!jsonData.hasError || jsonData.hasError==false) {
+				$('#add_to_cart button').addClass('added');
+			}
+			else {
+				$('#add_to_cart button').removeClass('added');
+			}
+		}
 		else
 			$('.ajax_add_to_cart_button').removeAttr('disabled');
 	},
diff --git a/themes/default-bootstrap/js/product.js b/themes/default-bootstrap/js/product.js
index 2f32a252f..8f17aa111 100644
--- a/themes/default-bootstrap/js/product.js
+++ b/themes/default-bootstrap/js/product.js
@@ -545,8 +545,8 @@ $(document).ready(function()
 	{
 		$('#bigpic').attr('rel', $('#bigpic').attr('src').replace('large', 'thickbox'));
 		$('img.jqzoom').jqueryzoom({
-			xzoom: 200, //zooming div default width(default width value is 200)
-			yzoom: 200, //zooming div default width(default height value is 200)
+			xzoom: 600, //zooming div default width(default width value is 200)
+			yzoom: 600, //zooming div default width(default height value is 200)
 			offset: 21 //zooming div default offset(default offset value is 10)
 			//position: "right" //zooming div position(default position value is "right")
 		});
diff --git a/themes/default-bootstrap/order-address-multishipping.tpl b/themes/default-bootstrap/order-address-multishipping.tpl
index d917cf1db..0d30fd7dd 100644
--- a/themes/default-bootstrap/order-address-multishipping.tpl
+++ b/themes/default-bootstrap/order-address-multishipping.tpl
@@ -30,35 +30,6 @@
 	{assign var="back_order_page" value="order.php"}
 {/if}
 
-{* Will be deleted for 1.5 version and more *}
-{if !isset($formatedAddressFieldsValuesList)}
-	{$ignoreList.0 = "id_address"}
-	{$ignoreList.1 = "id_country"}
-	{$ignoreList.2 = "id_state"}
-	{$ignoreList.3 = "id_customer"}
-	{$ignoreList.4 = "id_manufacturer"}
-	{$ignoreList.5 = "id_supplier"}
-	{$ignoreList.6 = "date_add"}
-	{$ignoreList.7 = "date_upd"}
-	{$ignoreList.8 = "active"}
-	{$ignoreList.9 = "deleted"}	
-	
-	{* PrestaShop 1.4.0.17 compatibility *}
-	{if isset($addresses)}
-		{foreach from=$addresses key=k item=address}
-			{counter start=0 skip=1 assign=address_key_number}
-			{$id_address = $address.id_address}
-			{foreach from=$address key=address_key item=address_content}
-				{if !in_array($address_key, $ignoreList)}
-					{$formatedAddressFieldsValuesList.$id_address.ordered_fields.$address_key_number = $address_key}
-					{$formatedAddressFieldsValuesList.$id_address.formated_fields_values.$address_key = $address_content}
-					{counter}
-				{/if}
-			{/foreach}
-		{/foreach}
-	{/if}
-{/if}
-
 <script type="text/javascript">
 // <![CDATA[
 	{if !$opc}
diff --git a/themes/default-bootstrap/order-address.tpl b/themes/default-bootstrap/order-address.tpl
index aafc8908d..1210bf24f 100644
--- a/themes/default-bootstrap/order-address.tpl
+++ b/themes/default-bootstrap/order-address.tpl
@@ -29,40 +29,6 @@
 	{assign var="back_order_page" value="order.php"}
 {/if}
 
-{*
-** Retro compatibility for PrestaShop version < 1.4.2.5 with a recent theme
-** Syntax smarty for v2
-*}
-
-{* Will be deleted for 1.5 version and more *}
-{if !isset($formatedAddressFieldsValuesList)}
-	{$ignoreList.0 = "id_address"}
-	{$ignoreList.1 = "id_country"}
-	{$ignoreList.2 = "id_state"}
-	{$ignoreList.3 = "id_customer"}
-	{$ignoreList.4 = "id_manufacturer"}
-	{$ignoreList.5 = "id_supplier"}
-	{$ignoreList.6 = "date_add"}
-	{$ignoreList.7 = "date_upd"}
-	{$ignoreList.8 = "active"}
-	{$ignoreList.9 = "deleted"}
-
-	{* PrestaShop 1.4.0.17 compatibility *}
-	{if isset($addresses)}
-		{foreach from=$addresses key=k item=address}
-			{counter start=0 skip=1 assign=address_key_number}
-			{$id_address = $address.id_address}
-			{foreach from=$address key=address_key item=address_content}
-				{if !in_array($address_key, $ignoreList)}
-					{$formatedAddressFieldsValuesList.$id_address.ordered_fields.$address_key_number = $address_key}
-					{$formatedAddressFieldsValuesList.$id_address.formated_fields_values.$address_key = $address_content}
-					{counter}
-				{/if}
-			{/foreach}
-		{/foreach}
-	{/if}
-{/if}
-
 <script type="text/javascript">
 // <![CDATA[
 	{if !$opc}
diff --git a/themes/default-bootstrap/sass/global.scss b/themes/default-bootstrap/sass/global.scss
index 0c9dec188..9cd98c8e8 100644
--- a/themes/default-bootstrap/sass/global.scss
+++ b/themes/default-bootstrap/sass/global.scss
@@ -2230,6 +2230,70 @@ a.price_discount_delete {
 		}
 	}
 }
+@media (max-width: 767px) {
+  #order-detail-content{
+    #cart_summary{
+      table, thead, tbody, th, td, tr{display: block;}
+      thead tr{
+        position: absolute;
+        top: -9999px;
+        left: -9999px;        
+      }
+      tr{
+        border-bottom: 1px solid #ccc;
+        overflow: hidden;
+      }
+      td{
+        border: none;
+        position: relative;
+        width: 50%;
+        float: left;
+        white-space: normal;
+        &.cart_product{}
+        &.cart_description{}
+        &.cart_avail{clear: both;}
+        &.cart_unit{}
+        &.cart_quantity{
+          clear: both;
+          padding: 9px 8px 11px 18px;
+        }
+        &.cart_total{}
+        &.cart_delete{
+          width: 100%;
+          clear: both;
+          text-align: right;
+          &:before{
+            display: inline-block;
+            padding-right: 0.5em;
+            position: relative;
+            top: -3px;
+          }
+          div{display: inline;}
+        }
+      }
+      td:before {
+        content: attr(data-title);
+        display: block;
+      }
+      tfoot{
+        td{
+          float: none;
+          width: 100%;
+          &:before{
+            display: inline;
+          }
+        }
+        tr{
+          .text-right, .price{
+            display: block;
+            float: left;
+            width: 50%;
+          }
+        }
+      }
+    }
+  }
+}
 .cart_voucher {
 	vertical-align:top !important;
 	h4 {
@@ -3201,4 +3265,11 @@ div.star.star_hover {
 	#facebook_block, #cmsinfo_block {
 		height:344px;
 	}
+}
+
+/************************* Zoom ******************************/
+@media  (max-width: $screen-md-max) { // max 1199px 
+	.zoomdiv {
+		display:none !important;
+	}
 }
\ No newline at end of file
diff --git a/themes/default-bootstrap/sass/product.scss b/themes/default-bootstrap/sass/product.scss
index 060888ef1..6f1638592 100644
--- a/themes/default-bootstrap/sass/product.scss
+++ b/themes/default-bootstrap/sass/product.scss
@@ -555,9 +555,18 @@ padding:18px 19px 12px;
 																		} 	
 	 
     }
-	&.disabled {
+	&.added {
 		&:before {
-			content:"";	
+			content:"";	
+		}
+	}
+	&.added.disabled, &.disabled {
+		&:before {
+			content:"";
+			animation:2s linear 0s normal none infinite spin;
+			-webkit-animation:2s linear 0s normal none infinite spin;
+			-moz-animation:2s linear 0s normal none infinite spin;
+			border:none;
 		}
 	}
 	 
diff --git a/themes/default-bootstrap/shopping-cart-product-line.tpl b/themes/default-bootstrap/shopping-cart-product-line.tpl
index f082731bc..15da9bf83 100644
--- a/themes/default-bootstrap/shopping-cart-product-line.tpl
+++ b/themes/default-bootstrap/shopping-cart-product-line.tpl
@@ -31,8 +31,8 @@
         <small class="cart_ref">{l s='SKU'} : {if $product.reference}{$product.reference|escape:'html':'UTF-8'}{else}--{/if}</small>
 		{if isset($product.attributes) && $product.attributes}<small><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}">{$product.attributes|escape:'html':'UTF-8'}</a></small>{/if}
 	</td>
-	<td class="cart_avail">{if $product.quantity_available > 0}<span class="label label-success">{l s='In Stock'}</span>{else}<span class="label label-warning">{l s='Out of Stock'}</span>{/if}</td>
-	<td class="cart_unit">
+	<td class="cart_avail" >{if $product.quantity_available > 0}<span class="label label-success">{l s='In Stock'}</span>{else}<span class="label label-warning">{l s='Out of Stock'}</span>{/if}</td>
+	<td class="cart_unit" data-title="{l s='Unit price'}">
 		<span class="price" id="product_price_{$product.id_product}_{$product.id_product_attribute}{if $quantityDisplayed > 0}_nocustom{/if}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
 			{if !empty($product.gift)}
 				<span class="gift-icon">{l s='Gift!'}</span>
@@ -85,7 +85,7 @@
 		{/if}
 	</td>
     {/if}
-	<td class="cart_total">
+	<td class="cart_total" data-title="{l s='Total'}">
 		<span class="price" id="total_product_price_{$product.id_product}_{$product.id_product_attribute}{if $quantityDisplayed > 0}_nocustom{/if}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
 			{if !empty($product.gift)}
 				<span class="gift-icon">{l s='Gift!'}</span>
@@ -99,7 +99,7 @@
 		</span>
 	</td>
 	{if !isset($noDeleteButton) || !$noDeleteButton}
-		<td class="cart_delete text-center">
+		<td class="cart_delete text-center" data-title="Delete">
 		{if (!isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0) && empty($product.gift)}
 			<div>
 				<a rel="nofollow" title="{l s='Delete'}" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html'}"><i class="icon-trash"></i></a>