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 d0847c234..f33f11a01 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
@@ -28,6 +28,10 @@
 
 <script type="text/javascript">
 	$('#product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_content').parent().hide();
-	$("#product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_link").fancybox();
+	$("#product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_link").fancybox({
+		autoDimensions: false,
+		autoSize: false,
+		width: 600,
+		height: 250});
 	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add')); });
 </script>
\ No newline at end of file
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 bb83283db..5fb6da3ba 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,11 +1,12 @@
 <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">
+		<select multiple size="10" 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>
+		<div class="clearfix">&nbsp;</div>
 		<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>
@@ -13,11 +14,12 @@
 	</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" >
+		<select multiple size="10" 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>
+		<div class="clearfix">&nbsp;</div>
 		<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'}
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
index 55f18255f..4d3a7b1e5 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -147,14 +147,14 @@
 										</button>
 										<ul class="dropdown-menu" role="menu">
 											<li>
-												<a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}" target="_blank">
+												<a href="{$current}&token={$token}&csvfilename={$filename|@urlencode}" target="_blank">
 													<i class="icon-download"></i>
 													{l s='Download'}
 												</a>
 											</li>
 											<li class="divider"></li>
 											<li>
-												<a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}&delete=1">
+												<a href="{$current}&token={$token}&csvfilename={$filename|@urlencode}&delete=1">
 													<i class="icon-trash"></i>
 													{l s='Delete'}
 												</a>
@@ -404,7 +404,7 @@
 
 	$(document).ready(function() {
 
-		var file_add_button = Ladda.create( document.querySelector('#file-add-button' ));
+		var file_add_button = Ladda.create(document.querySelector('#file-add-button'));
 		var file_total_files = 0;
 		
 		$('#file').fileupload({
@@ -427,15 +427,16 @@
 						else {
 							$(data.context).find('button').remove();
 
-							var name = encodeURIComponent(data.result.file.name);
+							console.log(data.result.file);
+							var filename = encodeURIComponent(data.result.file.filename);
 							var row = $('#csv_uploaded_history tr:first').clone();
 
 							$('#csv_uploaded_history').append(row);
 							row.removeClass('hide');
 							row.find('td:first').html(data.result.file.filename);
 							row.find('button.csv-use-btn').data('filename', data.result.file.filename);
-							row.find('a.csv-download-link').attr('href','{$current}&token={$token}&csvfilename='+name);
-							row.find('a.csv-delete-link').attr('href','{$current}&token={$token}&csvfilename='+name+'&delete=1');
+							row.find('a.csv-download-link').attr('href','{$current}&token={$token}&csvfilename='+filename);
+							row.find('a.csv-delete-link').attr('href','{$current}&token={$token}&csvfilename='+filename+'&delete=1');
 							csv_select(data.result.file.filename);
 							var items = $('#csv_uploaded_history tr').length -1;
 							$('.csv-history-nb').html(items);
diff --git a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
index 9344fbc37..a3309c9fd 100644
--- a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<div class="bootstrap">
+<div class="bootstrap panel">
 	<h3><i class="icon-cogs"></i> {l s='Configuration'}</h3>
 	<div class="input-group">
 		<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
@@ -39,6 +39,6 @@
 	{if isset($display_multishop_checkbox) && $display_multishop_checkbox}
 	<input type="checkbox" name="activateModule" value="1"{if $module->active} checked="checked"{/if} 
 		onclick="location.href = '{$current_url}&enable='+(($(this).attr('checked')) ? 1 : 0)" />
-		{l s='Activate module for '}{$shop_context}
+	{l s='Activate module for'} {$shop_context}
 	{/if}
 </div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl
index e1da258bc..8b6c41c09 100755
--- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl
@@ -77,7 +77,7 @@
 							</td>
 							<td>
 								{assign var="module_name" value=$module->name}
-								<select name="t_{$module->name}" multiple="multiple">
+								<select name="t_{$module->name}" multiple="multiple" class="chosen moduleTabPreferencesChoise">
 									{foreach $tabs AS $t}
 										{if $t.active}
 											<option {if isset($tab_modules_preferences.$module_name) && in_array($t.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} class="group" value="{$t.id_tab}">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</option>
diff --git a/classes/Cart.php b/classes/Cart.php
index cc170a81d..f9cedddfd 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -790,10 +790,10 @@ class CartCore extends ObjectModel
 		)))
 			return false;
 
-		Cache::clean('Cart::getCartRules'.$this->id.'-'.CartRule::FILTER_ACTION_ALL);
-		Cache::clean('Cart::getCartRules'.$this->id.'-'.CartRule::FILTER_ACTION_SHIPPING);
-		Cache::clean('Cart::getCartRules'.$this->id.'-'.CartRule::FILTER_ACTION_REDUCTION);
-		Cache::clean('Cart::getCartRules'.$this->id.'-'.CartRule::FILTER_ACTION_GIFT);
+		Cache::clean('Cart::getCartRules_'.$this->id.'-'.CartRule::FILTER_ACTION_ALL);
+		Cache::clean('Cart::getCartRules_'.$this->id.'-'.CartRule::FILTER_ACTION_SHIPPING);
+		Cache::clean('Cart::getCartRules_'.$this->id.'-'.CartRule::FILTER_ACTION_REDUCTION);
+		Cache::clean('Cart::getCartRules_'.$this->id.'-'.CartRule::FILTER_ACTION_GIFT);
 	
 		if ((int)$cartRule->gift_product)
 			$this->updateQty(1, $cartRule->gift_product, $cartRule->gift_product_attribute, false, 'up', 0, null, false);
@@ -1127,10 +1127,10 @@ class CartCore extends ObjectModel
 
 	public function removeCartRule($id_cart_rule)
 	{
-		Cache::clean('Cart::getCartRules'.$this->id.'-'.CartRule::FILTER_ACTION_ALL);
-		Cache::clean('Cart::getCartRules'.$this->id.'-'.CartRule::FILTER_ACTION_SHIPPING);
-		Cache::clean('Cart::getCartRules'.$this->id.'-'.CartRule::FILTER_ACTION_REDUCTION);
-		Cache::clean('Cart::getCartRules'.$this->id.'-'.CartRule::FILTER_ACTION_GIFT);
+		Cache::clean('Cart::getCartRules_'.$this->id.'-'.CartRule::FILTER_ACTION_ALL);
+		Cache::clean('Cart::getCartRules_'.$this->id.'-'.CartRule::FILTER_ACTION_SHIPPING);
+		Cache::clean('Cart::getCartRules_'.$this->id.'-'.CartRule::FILTER_ACTION_REDUCTION);
+		Cache::clean('Cart::getCartRules_'.$this->id.'-'.CartRule::FILTER_ACTION_GIFT);
 
 		$result = Db::getInstance()->execute('
 		DELETE FROM `'._DB_PREFIX_.'cart_cart_rule`
diff --git a/classes/ProductSale.php b/classes/ProductSale.php
index d24400f5d..6830f628e 100644
--- a/classes/ProductSale.php
+++ b/classes/ProductSale.php
@@ -89,7 +89,8 @@ class ProductSaleCore
 	
 		$ids = array();
 		foreach ($products as $product)
-			$ids[$product['id_product']] = 1;
+			if (Validate::isUnsignedId($product['id_product']))
+				$ids[$product['id_product']] = 1;
 		$ids = array_keys($ids);
 		$ids = array_filter($ids);
 		sort($ids);
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index c936379be..85224e787 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -540,22 +540,22 @@ class AdminImportControllerCore extends AdminController
 			$entity_selected = (int)$this->context->cookie->entity_selected;
 
 		$csv_selected = '';
-		if (isset($this->context->cookie->csv_selected) && file_exists(_PS_ADMIN_DIR_.'/import/'.base64_decode($this->context->cookie->csv_selected)))
-			$csv_selected = base64_decode($this->context->cookie->csv_selected);
+		if (isset($this->context->cookie->csv_selected) && file_exists(_PS_ADMIN_DIR_.'/import/'.urldecode($this->context->cookie->csv_selected)))
+			$csv_selected = urldecode($this->context->cookie->csv_selected);
 		else
 			$this->context->cookie->csv_selected = $csv_selected;
 
 		$id_lang_selected = '';
 		if (isset($this->context->cookie->iso_lang_selected) && $this->context->cookie->iso_lang_selected)
-			$id_lang_selected = (int)Language::getIdByIso(base64_decode($this->context->cookie->iso_lang_selected));
+			$id_lang_selected = (int)Language::getIdByIso(urldecode($this->context->cookie->iso_lang_selected));
 
 		$separator_selected = $this->separator;
 		if (isset($this->context->cookie->separator_selected) && $this->context->cookie->separator_selected)
-			$separator_selected = base64_decode($this->context->cookie->separator_selected);
+			$separator_selected = urldecode($this->context->cookie->separator_selected);
 
 		$multiple_value_separator_selected = $this->multiple_value_separator;
 		if (isset($this->context->cookie->multiple_value_separator_selected) && $this->context->cookie->multiple_value_separator_selected)
-			$multiple_value_separator_selected = base64_decode($this->context->cookie->multiple_value_separator_selected);
+			$multiple_value_separator_selected = urldecode($this->context->cookie->multiple_value_separator_selected);
 
 		//get post max size
 		$post_max_size = ini_get('post_max_size');
@@ -653,10 +653,10 @@ class AdminImportControllerCore extends AdminController
 			$data[$i] = $this->generateContentTable($i, $nb_column, $handle, $this->separator);
 
 		$this->context->cookie->entity_selected = (int)Tools::getValue('entity');
-		$this->context->cookie->iso_lang_selected = base64_encode(Tools::getValue('iso_lang'));
-		$this->context->cookie->separator_selected = base64_encode($this->separator);
-		$this->context->cookie->multiple_value_separator_selected = base64_encode($this->multiple_value_separator);
-		$this->context->cookie->csv_selected = base64_encode(Tools::getValue('csv'));
+		$this->context->cookie->iso_lang_selected = urlencode(Tools::getValue('iso_lang'));
+		$this->context->cookie->separator_selected = urlencode($this->separator);
+		$this->context->cookie->multiple_value_separator_selected = urlencode($this->multiple_value_separator);
+		$this->context->cookie->csv_selected = urlencode(Tools::getValue('csv'));
 
 		$this->tpl_view_vars = array(
 			'import_matchs' => Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'import_match'),
@@ -3101,7 +3101,7 @@ class AdminImportControllerCore extends AdminController
 		}
 		elseif ($filename = Tools::getValue('csvfilename'))
 		{
-			$filename = base64_decode($filename);
+			$filename = urldecode($filename);
 			$file =  _PS_ADMIN_DIR_.'/import/'.basename($filename);
 			if (realpath(dirname($file)) != _PS_ADMIN_DIR_.DIRECTORY_SEPARATOR.'import')
 				exit();
@@ -3135,7 +3135,7 @@ class AdminImportControllerCore extends AdminController
 				}
 			}	
 		}
-		parent::postProcess();
+		return parent::postProcess();
 	}
 
 	public static function setLocale()
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index e0672255e..b285bde2e 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -66,7 +66,7 @@ class ParentOrderControllerCore extends FrontController
 			
 		if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 && Dispatcher::getInstance()->getController() != 'orderopc')
 		{
-			if (isset($_GET['step']) && $_GET['step'] == 3)
+			if (Tools::getIsset('step') && Tools::getValue('step') == 3)
 				Tools::redirect('index.php?controller=order-opc&isPaymentStep=true');
 			Tools::redirect('index.php?controller=order-opc');
 		}
@@ -210,10 +210,10 @@ class ParentOrderControllerCore extends FrontController
 		$this->context->cart->gift = (int)(Tools::getValue('gift'));
 		if ((int)(Tools::getValue('gift')))
 		{
-			if (!Validate::isMessage($_POST['gift_message']))
+			if (!Validate::isMessage(Tools::getValue('gift_message')))
 				$this->errors[] = Tools::displayError('Invalid gift message.');
 			else
-				$this->context->cart->gift_message = strip_tags($_POST['gift_message']);
+				$this->context->cart->gift_message = strip_tags(Tools::getValue('gift_message'));
 		}
 
 		if (isset($this->context->customer->id) && $this->context->customer->id)
diff --git a/modules/blockcontact/blockcontact.tpl b/modules/blockcontact/blockcontact.tpl
index ac4c2e42c..763921dfa 100644
--- a/modules/blockcontact/blockcontact.tpl
+++ b/modules/blockcontact/blockcontact.tpl
@@ -28,6 +28,6 @@
 	<div class="block_content clearfix">
 			<p>{l s='Our support hotline is available 24/7.' mod='blockcontact'}</p>
 			{if $telnumber != ''}<p class="tel"><span class="label">{l s='Phone:' mod='blockcontact'}</span>{$telnumber|escape:'html':'UTF-8'}</p>{/if}
-			{if $email != ''}<a href="mailto:{$email|escape:'html':'UTF-8'}">{l s='Contact our expert support team!' mod='blockcontact'}</a>{/if}
+			{if $email != ''}<a href="mailto:{$email|escape:'html':'UTF-8'}" title="{l s='Contact our expert support team!' mod='blockcontact'}">{l s='Contact our expert support team!' mod='blockcontact'}</a>{/if}
 	</div>
 </div>
diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js
index 0a2301555..f3c31f290 100644
--- a/modules/blocklayered/blocklayered.js
+++ b/modules/blocklayered/blocklayered.js
@@ -328,8 +328,10 @@ function openCloseFilter()
 function stopAjaxQuery() {
 	if (typeof(ajaxQueries) == 'undefined')
 		ajaxQueries = new Array();
-	for(i = 0; i < ajaxQueries.length; i++)
-		ajaxQueries[i].abort();
+	for(i = 0; i < ajaxQueries.length; i++) {
+		if (typeof ajaxQueries[i] != 'undefined')
+			ajaxQueries[i].abort();
+	}		
 	ajaxQueries = new Array();
 }
 
diff --git a/modules/blockrss/blockrss.tpl b/modules/blockrss/blockrss.tpl
index 7a4f22417..b998c66c7 100644
--- a/modules/blockrss/blockrss.tpl
+++ b/modules/blockrss/blockrss.tpl
@@ -30,7 +30,7 @@
 		{if $rss_links}
 			<ul>
 				{foreach from=$rss_links item='rss_link'}
-					<li><a href="{$rss_link.url}">{$rss_link.title}</a></li>
+					<li><a href="{$rss_link.url}" title="{$rss_link.title}">{$rss_link.title}</a></li>
 				{/foreach}
 			</ul>
 		{else}
diff --git a/modules/blockviewed/blockviewed.tpl b/modules/blockviewed/blockviewed.tpl
index 7ab288c0a..277ca9741 100644
--- a/modules/blockviewed/blockviewed.tpl
+++ b/modules/blockviewed/blockviewed.tpl
@@ -31,7 +31,7 @@
 			{foreach from=$productsViewedObj item=viewedProduct name=myLoop}
 				<li class="clearfix{if $smarty.foreach.myLoop.last} last_item{elseif $smarty.foreach.myLoop.first} first_item{else} item{/if}">
 					<a href="{$viewedProduct->product_link|escape:'html'}" title="{l s='About' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}" class="content_img">
-					<img src="{if isset($viewedProduct->id_image) && $viewedProduct->id_image}{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'medium_default')}{else}{$img_prod_dir}{$lang_iso}-default-medium_default.jpg{/if}" alt="{$viewedProduct->legend|escape:html:'UTF-8'}" />
+					<img src="{if isset($viewedProduct->id_image) && $viewedProduct->id_image}{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'medium_default')}{else}{$img_prod_dir}{$lang_iso}-default-medium_default.jpg{/if}" alt="{$viewedProduct->legend|escape:html:'UTF-8'}" title="{$viewedProduct->legend|escape:html:'UTF-8'}"/>
 					</a>
 					<div class="text_desc">
 						<h5 class="s_title_block"><a href="{$viewedProduct->product_link|escape:'html'}" title="{l s='About' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}</a></h5>