diff --git a/admin-dev/ajaxfilemanager/ajax_file_upload.php b/admin-dev/ajaxfilemanager/ajax_file_upload.php
index b21a39c13..c942991ed 100755
--- a/admin-dev/ajaxfilemanager/ajax_file_upload.php
+++ b/admin-dev/ajaxfilemanager/ajax_file_upload.php
@@ -22,26 +22,18 @@
 								
 	$upload->setInvalidFileExt(explode(",", CONFIG_UPLOAD_INVALID_EXTS));
 	if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_UPLOAD)
-	{
 		$error = SYS_DISABLED;
-	}
 	elseif(empty($_GET['folder']) || !isUnderRoot($_GET['folder']))
-	{
 		$error = ERR_FOLDER_PATH_NOT_ALLOWED;
-	}else	if(!$upload->isFileUploaded('file'))
-	{
+	elseif (!$upload->isFileUploaded('file'))
 		$error = ERR_FILE_NOT_UPLOADED;
-	}else if(!$upload->moveUploadedFile($_GET['folder']))
-	{
-		$error = ERR_FILE_MOVE_FAILED;
-	}	
-	elseif(!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS)))
-	{		
+	elseif (!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS)))
 		$error = ERR_FILE_TYPE_NOT_ALLOWED;
-	}elseif(defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE))
-	{		
+	elseif (defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE))	
 		 $error = sprintf(ERROR_FILE_TOO_BID, transformFileSize(CONFIG_UPLOAD_MAXSIZE));
-	}else
+	elseif (!$upload->moveUploadedFile($_GET['folder']))
+		$error = ERR_FILE_MOVE_FAILED;
+	else
 	{
 							include_once(CLASS_FILE);
 							$path = $upload->getFilePath();
diff --git a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
index c72110344..bb85caada 100755
--- a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
+++ b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
@@ -24,7 +24,8 @@
 		if(!empty($_GET['search']))
 		{
 			include_once(CLASS_SEARCH);
-			
+			if (!preg_match('/^'.Tools::pRegexp(realpath(dirname(__FILE__).'/'.$_GET['search_folder']), '/').'/i', _PS_ROOT_DIR_.'/img/cms'))
+				exit;
 			$search  = new Search($_GET['search_folder']);
 			$search->addSearchKeyword('recursive', @$_GET['search_recursively']);
 			$search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']);
diff --git a/admin-dev/ajaxfilemanager/inc/config.base.php b/admin-dev/ajaxfilemanager/inc/config.base.php
index 28155f21e..5b57feed0 100755
--- a/admin-dev/ajaxfilemanager/inc/config.base.php
+++ b/admin-dev/ajaxfilemanager/inc/config.base.php
@@ -78,9 +78,9 @@
 	define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
 	
 	define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
-	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png');// // 
+	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png');// // 
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
-	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,png');
+	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,jpeg,jpeg,png');
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
 	define('CONFIG_UPLOAD_INVALID_EXTS', '');
 
diff --git a/admin-dev/ajaxfilemanager/inc/config.php b/admin-dev/ajaxfilemanager/inc/config.php
index 2f30ed245..09b4e4200 100755
--- a/admin-dev/ajaxfilemanager/inc/config.php
+++ b/admin-dev/ajaxfilemanager/inc/config.php
@@ -10,6 +10,9 @@
 	
 	//FILESYSTEM CONFIG	<br>
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.auth.php");	
+	if (_PS_MODE_DEMO_)
+		die('This functionality has been disabled.');
+
 	define('CONFIG_QUERY_STRING_ENABLE', true); //Enable passed query string to setting the system configuration
 	if(!isset($_SESSION))
 	{
diff --git a/admin-dev/ajaxfilemanager/inc/config.tinymce.php b/admin-dev/ajaxfilemanager/inc/config.tinymce.php
index c406f47e5..9070323a2 100755
--- a/admin-dev/ajaxfilemanager/inc/config.tinymce.php
+++ b/admin-dev/ajaxfilemanager/inc/config.tinymce.php
@@ -73,9 +73,9 @@
 	define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid
 	
 	define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
-	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
+	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,txt'); // 
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');//
-	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
+	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf');
 	//define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // 
 	define('CONFIG_UPLOAD_INVALID_EXTS', '');
 
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
index ac3651e00..26d3a4930 100644
--- a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
+++ b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
@@ -53,12 +53,12 @@
 			{/if}
 			<dl class="dl-horizontal">			
 				<dt>{l s='Sent on:'}</dt>
-				<dd>{$message.date_add}</dd> 
+				<dd>{$message.date_add}&nbsp;</dd>
 			</dl>
 			{if empty($message.id_employee)}
 			<dl class="dl-horizontal">
 				<dt>{l s='Browser:'}</dt>
-				<dd>{$message.user_agent}</dd>
+				<dd>{$message.user_agent}&nbsp;</dd>
 			</dl>
 			{/if}
 			{if !empty($message.file_name) && $file_name}
@@ -72,33 +72,26 @@
 				</dd>
 			</dl>
 			{/if}
-			{if !empty($message.id_order) && empty($message.id_employee)}
-				<dl class="dl-horizontal">
+			{if !empty($message.id_order) && $is_valid_order_id && empty($message.id_employee)}
+				<dl>
 					<dt>{l s='Order #'}</dt> 
-					<dd>
-						<a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
-							{$message.id_order} <i class="icon-search"></i>
-						</a>
+					<dd><a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">{$message.id_order} <img src="../img/admin/search.gif" alt="{l s='View'}" /></a>
 					</dd>
 				</dl>
 			{/if}
 			{if !empty($message.id_product) && empty($message.id_employee)}
 				<dl class="dl-horizontal">
 					<dt>{l s='Product #'}</dt> 
-					<dd>
-						<a href="index.php?tab=AdminProducts&id_product={$message.id_product}&updateproduct&token={getAdminToken tab='AdminProducts'}" title="{l s='View order'}">
-							{$message.id_product} <i class="icon-search"></i>
-						</a>
-					</dd>
+					<dd><a href="index.php?tab=AdminProducts&id_product={$message.id_product}&updateproduct&token={getAdminToken tab='AdminProducts'}" title="{l s='View order'}">{$message.id_product} <img src="../img/admin/search.gif" alt="{l s='View'}" /></a></dd>
 				</dl>
 			{/if}
-
-			<form action="{$current}&token={$token}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread" method="post" class="form-horizontal">
-				<dl class="dl-horizontal">
-					<dt> {l s='Subject:'}</dt>
+			
+			<form class="form-horizontal" action="{$current}&token={$token}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread" method="post">
+				<input type="hidden" name="id_customer_message" value="{$message.id_customer_message}" />
+				<dl>
+					<dt>{l s='Subject:'}</dt>
 					<dd>
-						<input type="hidden" name="id_customer_message" value="{$message.id_customer_message}" />
-						<select name="id_contact" onchange="this.form.submit();" class="col-lg-3">
+						<select name="id_contact" onchange="this.form.submit();">
 							{foreach $contacts as $contact}
 								<option value="{$contact.id_contact}" {if $contact.id_contact == $message.id_contact}selected="selected"{/if}>
 									{$contact.name}
@@ -200,4 +193,4 @@
 			</form>
 		</div>
 	</div>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
index a9e9aabb4..780737498 100644
--- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
@@ -26,7 +26,6 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
-
 <script type="text/javascript">
 	function saveCustomerNote()
 	{
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 0930d0edc..7186f2e76 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
@@ -26,7 +26,7 @@
 <div class="leadin">{block name="leadin"}{/block}</div>
 {if $module_confirmation}
 <div class="module_confirmation conf confirm">
-	{l s='Your .CSV file has been sucessfully imported into your shop.'}
+	{l s='Your .CSV file has been sucessfully imported into your shop. Don\'t forget to Re-build the products search index.'}
 </div>
 {/if}
 <div style="display: none">
@@ -118,6 +118,7 @@
 					<a class="list-group-item" href="../docs/csv_import/addresses_import.csv" target="_blank">{l s='Sample Addresses file'}</a>
 					<a class="list-group-item" href="../docs/csv_import/manufacturers_import.csv" target="_blank">{l s='Sample Manufacturers file'}</a>
 					<a class="list-group-item" href="../docs/csv_import/suppliers_import.csv" target="_blank">{l s='Sample Suppliers file'}</a>
+					<a class="list-group-item" href="../docs/csv_import/alias_import.csv" target="_blank">{l s='Sample Alias file'}</a>
 					{if $PS_ADVANCED_STOCK_MANAGEMENT}
 						<a class="list-group-item" href="../docs/csv_import/supply_orders_import.csv" target="_blank">{l s='Supply Orders sample file'}</a>
 						<a class="list-group-item" href="../docs/csv_import/supply_orders_details_import.csv" target="_blank">{l s='Supply Orders Details sample file'}</a>
@@ -291,30 +292,35 @@
 		});
 
 		$("select#entity").change(function(){
-			if ($("#entity > option:selected").val() == 7 || $("#entity > option:selected").val() == 8)
+			if ($("#entity > option:selected").val() == 8 || $("#entity > option:selected").val() == 9)
 				$("label[for=truncate],#truncate").hide();
 			else
 				$("label[for=truncate],#truncate").show();
 	
-			if ($("#entity > option:selected").val() == 8)
-			{
+			if ($("#entity > option:selected").val() == 9)
 				$(".import_supply_orders_details").show();
-				$('input[name=multiple_value_separator]').val('|');
-			}
 			else
 			{
 				$(".import_supply_orders_details").hide();
 				$('input[name=multiple_value_separator]').val('{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected}{else},{/if}');
 			}
 			if ($("#entity > option:selected").val() == 1)
-				$("label[for=match_ref], #match_ref, label[for=regenerate], #regenerate").show();
+				$("label[for=match_ref], #match_ref").show();
 			else
-				$("label[for=match_ref], #match_ref, label[for=regenerate], #regenerate").hide();
+				$("label[for=match_ref], #match_ref").hide();
+
 			if ($("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 0)
-				$(".import_products_categories, label[for=regenerate], #regenerate").show();
+				$(".import_products_categories").show();
 			else
-				$(".import_products_categories, label[for=regenerate], #regenerate").hide();
-			if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6)
+				$(".import_products_categories").hide();
+
+			if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || 
+				$("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6)
+				$("label[for=regenerate], #regenerate").show()
+			else
+				$("label[for=regenerate], #regenerate").hide();
+
+			if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6 || $("#entity > option:selected").val() == 7)
 				$("label[for=forceIDs], #forceIDs").show();
 			else
 				$("label[for=forceIDs], #forceIDs").hide();
diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl
index 738e56c5b..b94175a87 100755
--- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl
@@ -96,14 +96,14 @@
 							</td>
 							<td>
 								<select name="i_{$module->name}" class="moduleFavorite">
-									<option value="" selected="selected">---</option>
+									<option value="" selected="selected">-</option>
 									<option value="1" {if isset($module->preferences.interest) && $module->preferences.interest eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
 									<option value="0" {if isset($module->preferences.interest) && $module->preferences.interest eq '0'}selected="selected"{/if}>{l s='No'}</option>
 								</select>
 							</td>
 							<td>
 								<select name="f_{$module->name}" class="moduleFavorite">
-									<option value="" selected="selected">---</option>
+									<option value="" selected="selected">-</option>
 									<option value="1" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
 									<option value="0" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '0'}selected="selected"{/if}>{l s='No'}</option>
 								</select>
diff --git a/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl
index 2e1cb9850..4b25301ab 100644
--- a/admin-dev/themes/default/template/controllers/modules/list.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/list.tpl
@@ -69,10 +69,7 @@
 						<div class="module_name">
 							<span style="display:none">{$module->name}</span>
 							{$module->displayName}
-
 							<small>v{$module->version}</small>
-							
-
 							{if isset($module->type) && $module->type == 'addonsMustHave'}
 								<span class="label label-info">{l s='Must Have'}</span>
 							{elseif isset($module->id) && $module->id gt 0}
@@ -86,20 +83,7 @@
 							{else}
 								<span class="label label-warning">{l s='Not installed'}</span>
 							{/if}
-<!-- 						{if isset($module->id) && $module->id gt 0}
-								<span class="label label-success{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span>
-							{else}
-								<span class="label label-warning">{l s='Not installed'}</span>
-							{/if} -->
 						</div>						
-						<!-- <p class="text-muted">
-							{if isset($module->author) && !empty($module->author)}
-								{l s='Developed by'} {$module->author|truncate:20:'...'}
-							{/if}
-							{if isset($module->version_addons)}
-								({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'})
-							{/if}
-						</p> -->
 						<p class="module_description">
 							{if isset($module->description) && $module->description ne ''}
 								{$module->description}
diff --git a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
index 1d8d283e0..e328ddab1 100644
--- a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
@@ -38,7 +38,7 @@
 				<span>
 					<select id="show_modules" onChange="autoUrl('show_modules', '{$url_show_modules}')" class="filter fixed-width-lg">
 						<option value="all">{l s='All modules'}&nbsp;</option>
-						<option>---------------</option>
+						<option>-</option>
 						{foreach $modules as $module}
 							<option value="{$module->id|intval}" {if $display_key == $module->id}selected="selected"{/if}>{$module->displayName}</option>
 						{/foreach}
@@ -51,7 +51,6 @@
 					</label>
 				</p>
 			</form>
-
 			<div id="modulePosition">
 				<form method="post" action="{$url_submit}" >
 
@@ -196,4 +195,4 @@
 			}
 		});
 	});
-</script>
\ No newline at end of file
+</script>
diff --git a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
index 6c2b4f0fb..3860f2533 100644
--- a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
@@ -39,4 +39,4 @@
 		<i class="icon-truck"></i>
 	</a>
 {/if}
-</span>
\ No newline at end of file
+</span>
diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index fba6583b6..f3af6c574 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -689,7 +689,7 @@
 			var id_product = Number(this.id_product);
 			var id_product_attribute = Number(this.id_product_attribute);
 			cart_quantity[Number(this.id_product)+'_'+Number(this.id_product_attribute)+'_'+Number(this.id_customization)] = this.cart_quantity;
-			cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="' + formatCurrency(parseFloat(this.price.replace(',', '.')), currency_format, currency_sign, currency_blank) + '" /></td><td>';
+			cart_content += '<tr><td><img src="'+this.image_link+'" title="'+this.name+'" /></td><td>'+this.name+'<br />'+this.attributes_small+'</td><td>'+this.reference+'</td><td><input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'" class="product_unit_price" value="' + this.numeric_price + '" /></td><td>';
 			cart_content += (!this.id_customization ? '<div class="input-group fixed-width-md"><div class="input-group-btn"><a href="#" class="btn btn-default increaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><i class="icon-caret-up"></i></a><a href="#" class="btn btn-default decreaseqty_product" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'"><i class="icon-caret-down"></i></a></div>' : '');
 			cart_content += (!this.id_customization ? '<input type="text" rel="'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" class="cart_quantity" value="'+this.cart_quantity+'" />' : '');
 			cart_content += (!this.id_customization ? '<div class="input-group-btn"><a href="#" class="delete_product btn btn-default" rel="delete_'+this.id_product+'_'+this.id_product_attribute+'_'+(this.id_customization ? this.id_customization : 0)+'" ><i class="icon-remove text-danger"></i></a></div></div>' : '');
@@ -748,6 +748,16 @@
 		$('#payment_list').html(payment_list);
 	}
 
+	function fixPriceFormat(price)
+	{
+		if(price.indexOf(',') > 0 && price.indexOf('.') > 0) // if contains , and .
+			if(price.indexOf(',') < price.indexOf('.')) // if , is before .
+				price = price.replace(',','');  // remove ,
+		price = price.replace(' ',''); // remove any spaces
+		price = price.replace(',','.'); // remove , if price did not cotain both , and .
+		return price;
+	}
+
 	function displaySummary(jsonSummary)
 	{
 		currency_format = jsonSummary.currency.format;
@@ -783,13 +793,13 @@
 		if (!changed_shipping_price)
 			$('#shipping_price').html('<b>' + formatCurrency(parseFloat(jsonSummary.summary.total_shipping), currency_format, currency_sign, currency_blank) + '</b>');
 		shipping_price_selected_carrier = jsonSummary.summary.total_shipping;
-		
-		$('#total_vouchers').html(formatCurrency(parseFloat(jsonSummary.summary.total_discounts_tax_exc.replace(',', '.')), currency_format, currency_sign, currency_blank));
-		$('#total_shipping').html(formatCurrency(parseFloat(jsonSummary.summary.total_shipping_tax_exc.replace(',', '.')), currency_format, currency_sign, currency_blank));
-		$('#total_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_tax.replace(',', '.')), currency_format, currency_sign, currency_blank));
-		$('#total_without_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_price_without_tax.replace(',', '.')), currency_format, currency_sign, currency_blank));
-		$('#total_with_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_price.replace(',', '.')), currency_format, currency_sign, currency_blank));
-		$('#total_products').html(formatCurrency(parseFloat(jsonSummary.summary.total_products.replace(',', '.')), currency_format, currency_sign, currency_blank));
+
+		$('#total_vouchers').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_discounts_tax_exc)), currency_format, currency_sign, currency_blank));
+		$('#total_shipping').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_shipping_tax_exc)), currency_format, currency_sign, currency_blank));
+		$('#total_taxes').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_tax)), currency_format, currency_sign, currency_blank));
+		$('#total_without_taxes').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_price_without_tax)), currency_format, currency_sign, currency_blank));
+		$('#total_with_taxes').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_price)), currency_format, currency_sign, currency_blank));
+		$('#total_products').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_products)), currency_format, currency_sign, currency_blank));
 		id_currency = jsonSummary.cart.id_currency;
 		$('#id_currency option').removeAttr('selected');
 		$('#id_currency option[value="'+id_currency+'"]').attr('selected', true);
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index bf1862951..6352e2d87 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -65,29 +65,27 @@
 		<div class="row">
 			<div class="col-lg-3 box-stats color3" >
 				<i class="icon-calendar-empty"></i>
-				<span class="title">{l s='Date'}<br /><small>sous-titre</small></span>
+				<span class="title">{l s='Date'}<br /><small>{l s='subtitle'}</small></span>
 				<span class="value">{dateFormat date=$order->date_add full=false}</span>
 			</div>
 			<div class="col-lg-3 box-stats color2" >
 				<i class="icon-comments"></i>
-				<span class="title">{l s='Messages'}<br /><small>sous-titre</small></span>
-				<!-- <span class="value">{sizeof($messages)}</span> -->
+				<span class="title">{l s='Messages'}<br /><small>{l s='subtitle'}</small></span>
 				<span class="value"><a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{sizeof($customer_thread_message)}</a></span>
 			</div>
 			<div class="col-lg-3 box-stats color1" >
 				<i class="icon-ok"></i>
-				<span class="title">{l s='Products'}<br /><small>sous-titre</small></span>
+				<span class="title">{l s='Products'}<br /><small>{l s='subtitle'}</small></span>
 				<span class="value">{sizeof($products)}</span>
 			</div>
 			<div class="col-lg-3 box-stats color4" >
 				<i class="icon-money"></i>
-				<span class="title">{l s='Total'}<br /><small>sous-titre</small></span>
+				<span class="title">{l s='Total'}<br /><small>{l s='subtitle'}</small></span>
 				<span class="value">{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</span>
 			</div>
 		</div>
 	</div>
 
-
 	<!-- Todo : Be smart and find the best place for Admin order hook -->
 	{hook h="displayAdminOrder" id_order=$order->id}
 	<div class="row">
@@ -534,7 +532,7 @@
 							<label class="control-label col-lg-3">{l s='Choose a standard message'}</label>
 							<div class="col-lg-9">
 								<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
-									<option value="0" selected="selected">--</option>
+									<option value="0" selected="selected">-</option>
 									{foreach from=$orderMessages item=orderMessage}
 									<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
 									{/foreach}
@@ -852,10 +850,6 @@
 		</div>
 	</div>
 
-		
-
-		
-
 	<form class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='This product cannot be returned.'}', '{l s='Quantity to cancel is greater than quantity available.'}');">
 		<input type="hidden" name="id_order" value="{$order->id}" />
 		<div style="display: none">
@@ -1114,8 +1108,6 @@
 		</div>
 	</form>
 
-	
-
 	{if (sizeof($messages))}
 	<div class="panel">
 		<h3>
diff --git a/admin-dev/themes/default/template/controllers/products/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl
index 56e4981b0..2b042eb0b 100644
--- a/admin-dev/themes/default/template/controllers/products/associations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/associations.tpl
@@ -92,16 +92,16 @@
 		<label class="control-label col-lg-3" for="id_manufacturer">{l s='Manufacturer:'}</label>
 		<div class="col-lg-5">
 			<select name="id_manufacturer" id="id_manufacturer">
-				<option value="0">-- {l s='Choose (optional)'} --</option>
+				<option value="0">- {l s='Choose (optional)'} -</option>
 				{if $product->id_manufacturer}
 				<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
 				{/if}
-				<option disabled="disabled">----------</option>
+				<option disabled="disabled">-</option>
 			</select>
 		</div>
 		<div class="col-lg-4">
 			<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
-				<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i> 
+				<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i>
 			</a>
 		</div>
 	</div>
diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl
index e1e7337e7..f0e083657 100644
--- a/admin-dev/themes/default/template/controllers/products/combinations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl
@@ -24,14 +24,12 @@
 *}
 {if isset($product->id) && !$product->is_virtual}
 <div class="panel">
-
 	<script type="text/javascript">
 		var msg_combination_1 = '{l s='Please choose an attribute.'}';
 		var msg_combination_2 = '{l s='Please choose a value.'}';
 		var msg_combination_3 = '{l s='You can only add one combination per attribute type.'}';
 		var msg_new_combination = '{l s='New combination'}';
 		var msg_cancel_combination = '{l s='Cancel combination'}';
-
 		var attrs = new Array();
 		var modifyattributegroup = "{l s='Modify this attribute combination.' js=1}";
 		attrs[0] = new Array(0, "---");
@@ -43,10 +41,8 @@
 			{/foreach}
 			);
 		{/foreach}
-
 		$(document).ready(function(){
 			populate_attrs();
-
 			$(".datepicker").datepicker({
 				prevText: '',
 				nextText: '',
@@ -54,14 +50,11 @@
 			});
 		});
 	</script>
-
 	<input type="hidden" name="submitted_tabs[]" value="Combinations" />
-
 	<h3>{l s='Add or modify combinations for this product.'}</h3>
 	<div class="alert alert-info">
 		{l s='Or use the'}&nbsp;<a class="btn btn-link bt-icon confirm_leave" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}"><i class="icon-magic"></i> {l s='Product combinations generator'} <i class="icon-external-link-sign"></i></a> {l s='in order to automatically create a set of combinations.'}
 	</div>
-	
 	{if $combination_exists}
 	<div class="alert alert-info" style="display:block">
 		{l s='Some combinations already exist. If you want to generate new combinations, the quantities for the existing combinations will be lost.'}<br/>
@@ -72,11 +65,8 @@
 		<br />
 		{include file="controllers/products/multishop/check_fields.tpl" product_tab="Combinations"}
 	{/if}
-
 	<div id="add_new_combination" class="panel" style="display: none;">
-
 		<div class="panel-heading">{l s='Add or modify combinations for this product.'}</div>
-
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_group">{l s='Attribute:'}</label>
 			<div class="col-lg-5">
@@ -89,14 +79,13 @@
 				</select>
 			</div>
 		</div>
-
 		<div class="row">
 			<label class="control-label col-lg-3" for="attribute">{l s='Value:'}</label>
 			<div class="col-lg-9">
 				<div class="form-group">
 					<div class="col-lg-8">
 						<select name="attribute" id="attribute">
-							<option value="0">---</option>
+							<option value="0">-</option>
 						</select>
 					</div>
 					<div class="col-lg-4">
@@ -113,9 +102,7 @@
 				</div>
 			</div>
 		</div>
-
 		<hr/>
-
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_reference">
 				<span class="label-tooltip" data-toggle="tooltip"
@@ -126,8 +113,7 @@
 			<div class="col-lg-5">
 				<input type="text" id="attribute_reference" name="attribute_reference" value="" />
 			</div>
-		</div>		
-
+		</div>
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_ean13">
 				{l s='EAN13:'}
@@ -135,8 +121,7 @@
 			<div class="col-lg-3">
 				<input maxlength="13" type="text" id="attribute_ean13" name="attribute_ean13" value="" />
 			</div>
-		</div>		
-
+		</div>
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_upc">
 				{l s='UPC:'}
@@ -144,10 +129,8 @@
 			<div class="col-lg-3">
 				<input maxlength="12" type="text" id="attribute_upc" name="attribute_upc" value="" />
 			</div>
-		</div>		
-		
+		</div>
 		<hr/>
-
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_wholesale_price">
 				{include file="controllers/products/multishop/checkbox.tpl" field="attribute_wholesale_price" type="default"}
@@ -165,7 +148,6 @@
 			</div>
 			<span style="display:none;" id="attribute_wholesale_price_full">({l s='Overrides wholesale price on "Information" tab'})</span>
 		</div>
-
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_price_impact">
 				{include file="controllers/products/multishop/checkbox.tpl" field="attribute_price_impact" type="attribute_price_impact"}
@@ -223,8 +205,6 @@
 				</div>
 			</div>
 		</div>
-			
-
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_weight_impact">
 				{include file="controllers/products/multishop/checkbox.tpl" field="attribute_weight_impact" type="attribute_weight_impact"}
@@ -255,7 +235,6 @@
 				</div>
 			</div>
 		</div>
-
 		<div id="tr_unit_impact" class="form-group">
 			<label class="control-label col-lg-3" for="attribute_unit_impact">
 				{include file="controllers/products/multishop/checkbox.tpl" field="attribute_unit_impact" type="attribute_unit_impact"}
@@ -284,7 +263,6 @@
 				</div>
 			</div>
 		</div>
-
 		{if $ps_use_ecotax}
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_ecotax">
@@ -303,7 +281,6 @@
 			</div>
 		</div>
 		{/if}
-
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_minimal_quantity">
 				{include file="controllers/products/multishop/checkbox.tpl" field="attribute_minimal_quantity" type="default"}
@@ -317,7 +294,6 @@
 				<input maxlength="6" name="attribute_minimal_quantity" id="attribute_minimal_quantity" type="text" value="{$minimal_quantity}" />
 			</div>
 		</div>
-
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="available_date_attribute">
 				{include file="controllers/products/multishop/checkbox.tpl" field="available_date_attribute" type="default"}
@@ -333,9 +309,7 @@
 				</div>
 			</div>
 		</div>
-		
 		<hr/>
-
 		<div class="form-group">
 			<label class="control-label col-lg-3">{l s='Image:'}</label>
 			<div class="col-lg-9">
@@ -344,14 +318,13 @@
 					<li>
 						<input type="checkbox" name="id_image_attr[]" value="{$image.id_image}" id="id_image_attr_{$image.id_image}" />
 						<label for="id_image_attr_{$image.id_image}">
-							<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-small_default.jpg" alt="{$image.legend|escape:'htmlall':'UTF-8'}" title="{$image.legend|escape:'htmlall':'UTF-8'}" />
+							<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-{$imageType}.jpg" alt="{$image.legend|escape:'htmlall':'UTF-8'}" title="{$image.legend|escape:'htmlall':'UTF-8'}" />
 						</label>
 					</li>
 					{/foreach}
 				</ul>
 			</div>
 		</div>
-
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="attribute_default">
 				{include file="controllers/products/multishop/checkbox.tpl" field="attribute_default" type="attribute_default"}
@@ -366,7 +339,6 @@
 				</p>
 			</div>
 		</div>
-		
 		<div class="panel-footer">
 			<span id="ResetSpan">
 				<button type="reset" name="ResetBtn" id="ResetBtn" onclick="$('#desc-product-newCombination').click();" class="btn btn-default">
@@ -377,4 +349,4 @@
 	</div>
 	{$list}
 </div>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index ee90b0a4a..caa7686c7 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -33,27 +33,42 @@
 </h3>
 
 <div class="row">
-	<label class="control-label col-lg-5 file_upload_label">
-		<span class="label-tooltip" data-toggle="tooltip"
-			title="{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}">
-			{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}
-		</span>
-	</label>
-	<div class="col-lg-7">
-		{l s='File:'}
-		<div id="file-uploader">
-			<noscript>
-				<p>{l s='Please enable JavaScript to use file uploader:'}</p>
-			</noscript>
+	<div class="form-group">
+		<label class="control-label col-lg-3 file_upload_label">
+			<span class="label-tooltip" data-toggle="tooltip"
+				title="{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}">
+				{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}
+			</span>
+		</label>
+		<div class="col-lg-9">
+			{l s='File:'}
+			<div id="file-uploader">
+				<noscript>
+					<p>{l s='Please enable JavaScript to use file uploader:'}</p>
+				</noscript>
+			</div>
+			<div id="progressBarImage" class="progressBarImage"></div>
+			<div id="showCounter" style="display:none;">
+				<span id="imageUpload">0</span><span id="imageTotal">0</span>
+			</div>
+			<input type="hidden" name="resizer" value="auto" />
+		{if Tools::getValue('id_image')}
+			<input type="hidden" name="id_image" value="{Tools::getValue('id_image')|intval}" />
+		{/if}
 		</div>
-		<div id="progressBarImage" class="progressBarImage"></div>
-		<div id="showCounter" style="display:none;">
-			<span id="imageUpload">0</span><span id="imageTotal">0</span>
+	</div>
+	<div class="form-group">
+		<label class="control-label col-lg-3">
+			{l s='Legend:'}
+		</label>
+		<div class="col-lg-9 translatable">
+			{foreach from=$languages item=language}
+			<div class="lang_{$language.id_lang}" style="{if !$language.is_default}display: none;{/if} float: left;">
+				<input class="updateCurrentText" type="text" {if !$product->id}disabled="disabled"{/if} id="legend_{$language.id_lang}" name="legend_{$language.id_lang}" value="{$product->name[$language.id_lang]|escape:'htmlall':'UTF-8'}"/>
+				<div class="help-block">{l s='Invalid characters:'} <>;=#{}</div>
+			</div>
+			{/foreach}
 		</div>
-		<input type="hidden" name="resizer" value="auto" />
-	{if Tools::getValue('id_image')}
-		<input type="hidden" name="id_image" value="{Tools::getValue('id_image')|intval}" />
-	{/if}
 	</div>
 </div>
 
@@ -61,6 +76,7 @@
 	<thead>
 		<tr class="nodrag nodrop"> 
 			<th class="fixed-width-sm"><span class="title_box">{l s='Image'}</span></th>
+			<th class="fixed-width-lg"><span class="title_box">{l s='Legend'}</span></th>
 			<th class="center fixed-width-xs"><span class="title_box">{l s='Position'}</span></th>
 			{if $shops}
 			{foreach from=$shops item=shop}
@@ -79,9 +95,10 @@
 	<tr id="image_id">
 		<td>
 			<a href="{$smarty.const._THEME_PROD_DIR_}image_path.jpg" class="fancybox">
-				<img src="{$smarty.const._THEME_PROD_DIR_}{$iso_lang}-default-small_default.jpg" alt="image_id" title="image_id" />
+				<img src="{$smarty.const._THEME_PROD_DIR_}{$iso_lang}-default-{$imageType}.jpg" alt="image_id" title="image_id" />
 			</a>
 		</td>
+		<td>legend</td>
 		<td id="td_image_id" class="pointer dragHandle center positionImage">
 			image_position
 		</td>
@@ -129,7 +146,7 @@
 			}
 			else
 				assoc = false;
-			imageLine({$image->id}, "{$image->getExistingImgPath()}", {$image->position}, "{if $image->cover}icon-check-sign{else}icon-check-empty{/if}", assoc);
+			imageLine({$image->id}, "{$image->getExistingImgPath()}", {$image->position}, "{if $image->cover}icon-check-sign{else}icon-check-empty{/if}", assoc, "{$image->legend[$default_language]|@addcslashes:'\"'}");
 		{/foreach}
 		{literal}
 		$("#imageTable").tableDnD(
@@ -149,19 +166,18 @@
 			}
 		});
 		var filecheck = 1;
-		var uploader = new qq.FileUploader(
+		var params = new Array;
+		params['id_product'] = {/literal}{$id_product|intval}{literal};
+		params['id_category'] = {/literal}{$id_category_default|intval}{literal};
+		params['token'] = "{/literal}{$token}{literal}";
+		params['tab'] = "AdminProducts";
+		params['action'] = "addImage";
+		params['ajax'] = 1;
+		uploader = new qq.FileUploader(
 		{
 			element: document.getElementById("file-uploader"),
 			action: "ajax-tab.php",
 			debug: false,
-			params: {
-				id_product : {/literal}{$id_product}{literal},
-				id_category : {/literal}{$id_category_default}{literal},
-				token : "{/literal}{$token}{literal}",
-				tab : "AdminProducts",
-				action : 'addImage',
-				ajax: 1
-			},
 			onComplete: function(id, fileName, responseJSON)
 			{
 				var percent = ((filecheck * 100) / nbfile);
@@ -186,7 +202,7 @@
 					cover = "icon-check-empty";
 					if (responseJSON.cover == "1")
 						cover = "icon-check-sign";
-					imageLine(responseJSON.id, responseJSON.path, responseJSON.position, cover, responseJSON.shops)
+					imageLine(responseJSON.id, responseJSON.path, responseJSON.position, cover, responseJSON.shops, responseJSON.legend[{/literal}{$default_language|intval}{literal}])
 					$("#imageTable tr:last").after(responseJSON.html);
 					$("#countImage").html(parseInt($("#countImage").html()) + 1);
 					$("#img" + id).remove();
@@ -199,6 +215,12 @@
 			},
 			onSubmit: function(id, filename)
 			{
+				$('input[id^="legend_"]').each(function()
+				{
+					id = $(this).prop("id").replace("legend_", "legend[") + "]";
+					params[id] = $(this).val();
+				});
+				uploader.setParams(params);
 				$("#imageTable").show();
 				$("#listImage").append("<li id='img"+id+"'><div>" + filename + "</div></div><a href=\"javascript:delQueue(" + id +");\"><img src=\"../img/admin/disabled.gif\" ></a><p class=\"errorImg\"></p></li>");
 			}
@@ -286,8 +308,7 @@
 				"ajax" : 1 
 			});
 		});
-		
-		//function	
+
 		function updateImagePosition(json)
 		{
 			doAdminAjax(
@@ -306,13 +327,14 @@
 			$("#img" + id).remove();
 		}
 		
-		function imageLine(id, path, position, cover, shops)
+		function imageLine(id, path, position, cover, shops, legend)
 		{
 			line = $("#lineType").html();
-			line = line.replace(/image_id/g, id);			
-			line = line.replace(/[a-z]{2}-default-small_default/g, path+'-small_default');
+			line = line.replace(/image_id/g, legend);			
+			line = line.replace(/[a-z]{0,2}-default-small_default/g, path+'-small_default');
 			line = line.replace(/image_path/g, path);
 			line = line.replace(/image_position/g, position);
+			line = line.replace(/legend/g, legend);
 			line = line.replace(/icon-check-empty/g, cover);
 			line = line.replace(/<tbody>/gi, "");
 			line = line.replace(/<\/tbody>/gi, "");
@@ -330,4 +352,4 @@
 	{/literal}
 </script>
 </div>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index 6ee1eb156..b07c3ba4d 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -429,6 +429,17 @@
 			<div class="row">
 			{/if}
 				{foreach from=$languages item=language}
+					{literal}
+					<script type="text/javascript">
+						$().ready(function () {
+							var input_id = '{/literal}tags_{$language.id_lang}{literal}';
+							$('#'+input_id).tagify({delimiters: [13,44], addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
+							$({/literal}'#{$table}{literal}_form').submit( function() {
+								$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
+							});
+						});
+					</script>
+					{/literal}
 				{if $languages|count > 1}
 				<div class="translatable-field lang-{$language.id_lang}">
 					<div class="col-lg-9">
diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl
index 6b869c090..56f76a432 100644
--- a/admin-dev/themes/default/template/controllers/products/prices.tpl
+++ b/admin-dev/themes/default/template/controllers/products/prices.tpl
@@ -444,7 +444,7 @@ $(document).ready(function () {
 						</div>
 						<div class="col-lg-6">
 							<select name="sp_reduction_type" id="sp_reduction_type">
-								<option selected="selected">---</option>
+								<option selected="selected">-</option>
 								<option value="amount">{l s='Amount'}</option>
 								<option value="percentage">{l s='Percentage'}</option>
 							</select>
@@ -453,7 +453,6 @@ $(document).ready(function () {
 				</div>
 				<p class="help-block">{l s='The discount is applied after the tax'}</p>
 			</div>
-
 		</div>
 	</div>
 	<script type="text/javascript">
diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
index 7c2800213..f426c5e1a 100644
--- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
@@ -58,6 +58,7 @@
 						$('#file_missing').hide();
 						$('#virtual_product_name').attr('value', fileName);
 						$("#upload-confirmation .error").remove();
+						$('#upload-confirmation div').find('span').remove()
 						$('#upload-confirmation div').prepend('<span>{l s='The file'}&nbsp;"<a class="link" href="get-file-admin.php?file='+msg+'&filename='+fileName+'">'+fileName+'</a>"&nbsp;{l s='has successfully been uploaded'}' +
 							'<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="' + msg + '" /></span>');
 						$("#upload-confirmation").show();
diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
index ffba8b6da..0ae2f099f 100644
--- a/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
@@ -112,7 +112,7 @@
 				<label class="control-label col-lg-3">{l s='Filter by product:'}</label>
 				<div class="col-lg-9">
 					<select id="selectProduct" name="selectProduct" style="width: 200px;" onfocus="fillProducts();" onchange="updateConversionRate(this.value);">
-						<option value="0" selected="selected">-- {l s='All'} --</option>
+						<option value="0" selected="selected">- {l s='All'} -</option>
 					</select>
 				</div>
 			</div>
@@ -127,6 +127,4 @@
 	<script type="text/javascript">
 		updateConversionRate(0);
 	</script>
-	
 {/block}
-
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 30d58f73a..c74ed0cba 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -44,14 +44,14 @@
 		var roundMode = {$round_mode};
 			{if isset($shop_context)}
 				{if $shop_context == Shop::CONTEXT_ALL}
-				var youEditFieldFor = "{l s='A modification of this field will be applied for all shops' slashes=1 }";
+				var youEditFieldFor = '{l s='A modification of this field will be applied for all shops' slashes=1}';
 					{elseif $shop_context == Shop::CONTEXT_GROUP}
-				var youEditFieldFor = "{l s='A modification of this field will be applied for all shops of group ' slashes=1 }<b>{$shop_name}</b>";
+				var youEditFieldFor = '{l s='A modification of this field will be applied for all shops of group' slashes=1}<b>{$shop_name}</b>';
 					{else}
-				var youEditFieldFor = "{l s='A modification of this field will be applied for the shop ' slashes=1 }<b>{$shop_name}</b>";
+				var youEditFieldFor = '{l s='A modification of this field will be applied for the shop' slashes=1}<b>{$shop_name}</b>';
 				{/if}
-				{else}
-			var youEditFieldFor = '';
+			{else}
+				var youEditFieldFor = '';
 			{/if}
 		{* Notifications vars *}
 		var autorefresh_notifications = '{$autorefresh_notifications}';
@@ -66,12 +66,12 @@
 		var new_msg = '{l s='A new message posted on your shop.' slashes=1}';
 		var excerpt_msg = '{l s='Excerpt: ' slashes=1}';
 		var see_msg = '{l s='Read this message' slashes=1}';
-		var token_admin_orders = '{getAdminToken tab='AdminOrders' slashes=1}';
-		var token_admin_customers = '{getAdminToken tab='AdminCustomers' slashes=1}';
-		var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads' slashes=1}';
+		var token_admin_orders = '{getAdminToken tab='AdminOrders'}';
+		var token_admin_customers = '{getAdminToken tab='AdminCustomers'}';
+		var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}';
 		var currentIndex = '{$currentIndex}';
 		var default_language = '{$default_language|intval}';
-		var choose_language_translate = "{l s='Choose language' slashes=1}";
+		var choose_language_translate = '{l s='Choose language' slashes=1}';
 		var admin_modules_link = '{$link->getAdminLink("AdminModules")|addslashes}';
 		var tab_modules_list = '{if isset($tab_modules_list) && $tab_modules_list}{$tab_modules_list|addslashes}{/if}';
 	</script>
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index eb605b76e..d9ef5e964 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -178,8 +178,7 @@
 											<script type="text/javascript">
 												$().ready(function () {
 													var input_id = '{/literal}{if isset($input.id)}{$input.id}{else}{$input.name}{/if}{literal}';
-													$('#'+input_id).tagify();
-													$('#'+input_id).tagify({delimiters: [13,44],addTagPrompt: '{/literal}{l s='Add tag'}{literal}'});
+													$('#'+input_id).tagify({delimiters: [13,44], addTagPrompt: '{/literal}{l s='Add tag'}{literal}'});
 													$({/literal}'#{$table}{literal}_form').submit( function() {
 														$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
 													});
@@ -337,7 +336,7 @@
 															{/if}
 														>{$option->$input.options.name}</option>
 													{elseif $option == "-"}
-														<option value="">--</option>
+														<option value="">-</option>
 													{else}
 														<option value="{$option[$input.options.id]}"
 															{if isset($input.multiple)}
diff --git a/admin-dev/themes/default/template/helpers/form/form_category.tpl b/admin-dev/themes/default/template/helpers/form/form_category.tpl
index e8542b4f2..9b20256c7 100644
--- a/admin-dev/themes/default/template/helpers/form/form_category.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form_category.tpl
@@ -24,11 +24,11 @@
 *}
 {if count($categories) && isset($categories)}
 	<script type="text/javascript">
-		var inputName = '{$categories.input_name}';
+		var inputName = '{$categories.input_name|@addcslashes:'\''}';
 		var use_radio = {if $categories.use_radio}1{else}0{/if};
-		var selectedCat = '{implode value=$categories.selected_cat}';
-		var selectedLabel = '{$categories.trads.selected}';
-		var home = '{$categories.trads.Root.name}';
+		var selectedCat = {$categories.selected_cat|@implode|intval};
+		var selectedLabel = '{$categories.trads.selected|@addcslashes:'\''}';
+		var home = '{$categories.trads.Root.name|@addcslashes:'\''}';
 		var use_radio = {if $categories.use_radio}1{else}0{/if};
 		var use_context = {if isset($categories.use_context)}1{else}0{/if};
 		$(document).ready(function(){
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index a0773f287..d5552015d 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -256,7 +256,7 @@
 						{else}
 							{if $params.type == 'bool'}
 								<select class="filter fixed-width-sm" onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$key}">
-									<option value="">--</option>
+									<option value="">-</option>
 									<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
 									<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
 								</select>
@@ -278,7 +278,7 @@
 							{elseif $params.type == 'select'}
 								{if isset($params.filter_key)}
 									<select class="filter" onchange="$('#submitFilterButton{$list_id}').focus();$('#submitFilterButton{$list_id}').click();" name="{$list_id}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
-										<option value="" {if $params.value == ''} selected="selected" {/if}>--</option>
+										<option value="" {if $params.value == ''} selected="selected" {/if}>-</option>
 										{if isset($params.list) && is_array($params.list)}
 											{foreach $params.list AS $option_value => $option_display}
 												<option value="{$option_value}" {if (string)$option_display === (string)$params.value ||  (string)$option_value === (string)$params.value} selected="selected"{/if}>{$option_display}</option>
diff --git a/admin-dev/themes/default/template/toolbar.tpl b/admin-dev/themes/default/template/toolbar.tpl
index c2eb566ee..fc8a6275d 100644
--- a/admin-dev/themes/default/template/toolbar.tpl
+++ b/admin-dev/themes/default/template/toolbar.tpl
@@ -83,7 +83,7 @@
 						btn_submit.hide();
 						//bind enter key press to validate form
 						$('#{$table}_form').keypress(function (e) {
-							if (e.which == 13 && e.target.localName != 'textarea')
+							if (e.which == 13 && e.target.localName != 'textarea' && !e.target.hasClass('tagify'))
 								$('#desc-{$table}-save').click();
 						});
 						//submit the form
diff --git a/classes/AdminTab.php b/classes/AdminTab.php
index 42eb7516e..bc8b7d019 100644
--- a/classes/AdminTab.php
+++ b/classes/AdminTab.php
@@ -1500,7 +1500,7 @@ abstract class AdminTabCore
 				case 'bool':
 					echo '
 					<select name="'.$this->table.'Filter_'.$key.'">
-						<option value="">--</option>
+						<option value="">-</option>
 						<option value="1"'.($value == 1 ? ' selected="selected"' : '').'>'.$this->l('Yes').'</option>
 						<option value="0"'.(($value == 0 && $value != '') ? ' selected="selected"' : '').'>'.$this->l('No').'</option>
 					</select>';
@@ -1524,7 +1524,7 @@ abstract class AdminTabCore
 					if (isset($params['filter_key']))
 					{
 						echo '<select onchange="$(\'#submitFilter'.$this->table.'\').focus();$(\'#submitFilter'.$this->table.'\').click();" name="'.$this->table.'Filter_'.$params['filter_key'].'" '.(isset($params['width']) ? 'style="width: '.$params['width'].'px"' : '').'>
-								<option value=""'.(($value == 0 && $value != '') ? ' selected="selected"' : '').'>--</option>';
+								<option value=""'.(($value == 0 && $value != '') ? ' selected="selected"' : '').'>-</option>';
 						if (isset($params['select']) && is_array($params['select']))
 							foreach ($params['select'] as $optionValue => $optionDisplay)
 							{
diff --git a/classes/Alias.php b/classes/Alias.php
index b6fda0903..386aa741d 100644
--- a/classes/Alias.php
+++ b/classes/Alias.php
@@ -124,5 +124,21 @@ class AliasCore extends ObjectModel
 	{
 		return Configuration::get('PS_ALIAS_FEATURE_ACTIVE');
 	}
+
+	/**
+	 * This method is allow to know if a alias exist for AdminImportController
+	 * @since 1.5.6.0
+	 * @return bool
+	 */
+	public static function aliasExists($id_alias)
+	{
+		$row = Db::getInstance()->getRow('
+			SELECT `id_alias`
+			FROM '._DB_PREFIX_.'alias a
+			WHERE a.`id_alias` = '.(int)$id_alias
+		);
+
+		return isset($row['id_alias']);
+	}
 }
 
diff --git a/classes/Autoload.php b/classes/Autoload.php
index 6d74b8b63..765a75d58 100644
--- a/classes/Autoload.php
+++ b/classes/Autoload.php
@@ -49,6 +49,8 @@ class Autoload
 	 */
 	public $index = array();
 
+	public $_include_override_path = true;
+
 	protected function __construct()
 	{
 		$this->root_dir = _PS_ROOT_DIR_.'/';
@@ -120,10 +122,16 @@ class Autoload
 	{
 		$classes = array_merge(
 			$this->getClassesFromDir('classes/'),
-			$this->getClassesFromDir('override/classes/'),
-			$this->getClassesFromDir('controllers/'),
-			$this->getClassesFromDir('override/controllers/')
+			$this->getClassesFromDir('controllers/')
 		);
+
+		if ($this->_include_override_path)
+			$classes = array_merge(
+				$classes,
+				$this->getClassesFromDir('override/classes/'),
+				$this->getClassesFromDir('override/controllers/')
+			);
+
 		ksort($classes);
 		$content = '<?php return '.var_export($classes, true).'; ?>';
 
@@ -189,4 +197,4 @@ class Autoload
 	{
 		return isset($this->index[$classname]) ? $this->index[$classname] : null;
 	}
-}
\ No newline at end of file
+}
diff --git a/classes/CMS.php b/classes/CMS.php
index db9d69d52..13b7cac0b 100644
--- a/classes/CMS.php
+++ b/classes/CMS.php
@@ -34,6 +34,7 @@ class CMSCore extends ObjectModel
 	public $link_rewrite;
 	public $id_cms_category;
 	public $position;
+	public $indexation;
 	public $active;
 
 	/**
@@ -46,6 +47,7 @@ class CMSCore extends ObjectModel
 		'fields' => array(
 			'id_cms_category' => 	array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'position' => 			array('type' => self::TYPE_INT),
+			'indexation' =>     	array('type' => self::TYPE_BOOL),
 			'active' => 			array('type' => self::TYPE_BOOL),
 
 			// Lang fields
diff --git a/classes/Cart.php b/classes/Cart.php
index d363905dd..f38015171 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -3219,7 +3219,7 @@ class CartCore extends ObjectModel
 	public function getWsCartRows()
 	{
 		return Db::getInstance()->executeS('
-			SELECT id_product, id_product_attribute, quantity
+			SELECT id_product, id_product_attribute, quantity, id_address_delivery
 			FROM `'._DB_PREFIX_.'cart_product`
 			WHERE id_cart = '.(int)$this->id.' AND id_shop = '.(int)Context::getContext()->shop->id
 		);
diff --git a/classes/CartRule.php b/classes/CartRule.php
index ea87a4174..1890bda2d 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -255,6 +255,16 @@ class CartRuleCore extends ObjectModel
 			else
 				$cart_rule['quantity_for_user'] = 0;
 
+		foreach ($result as $cart_rule)
+			if ($cart_rule['shop_restriction'])
+			{
+				$cartRuleShops = Db::getInstance()->executeS('SELECT id_shop FROM '._DB_PREFIX_.'cart_rule_shop WHERE id_cart_rule = '.(int)$cart_rule['id_cart_rule']);
+				foreach ($cartRuleShops as $cartRuleShop)
+					if (Shop::isFeatureActive() && ($cartRuleShop['id_shop'] == Context::getContext()->shop->id))
+						continue 2;
+				unset($result[$key]);
+			}
+
 		// Retrocompatibility with 1.4 discounts
 		foreach ($result as &$cart_rule)
 		{
diff --git a/classes/Currency.php b/classes/Currency.php
index af07ba30d..3280ec189 100644
--- a/classes/Currency.php
+++ b/classes/Currency.php
@@ -73,7 +73,7 @@ class CurrencyCore extends ObjectModel
 			'sign' => 			array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 8),
 			'format' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'decimals' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'required' => true),
-			'conversion_rate' =>array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true, 'shop' => true),
+			'conversion_rate' =>array('type' => self::TYPE_FLOAT, 'validate' => 'isUnsignedFloat', 'required' => true, 'shop' => true),
 			'deleted' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
 			'active' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
 		),
@@ -107,14 +107,23 @@ class CurrencyCore extends ObjectModel
 		$this->suffix =	$this->format % 2 == 0 ? ' '.$this->sign : '';
 	}
 	/**
-	 * Overriding check if currency with the same iso code already exists.
-	 * If it's true, currency is doesn't added.
+	 * Overriding check if currency rate is not empty and if currency with the same iso code already exists.
+	 * If it's true, currency is not added.
 	 *
 	 * @see ObjectModelCore::add()
 	 */
 	public function add($autodate = true, $nullValues = false)
 	{
-		return Currency::exists($this->iso_code, $this->iso_code_num) ? false : parent::add();
+		if ((float)$this->conversion_rate <= 0)
+			return false;
+		return Currency::exists($this->iso_code, $this->iso_code_num) ? false : parent::add($autodate, $nullValues);
+	}
+
+	public function update($autodate = true, $nullValues = false)
+	{
+		if ((float)$this->conversion_rate <= 0)
+			return false;
+		return parent::update($autodate, $nullValues);
 	}
 
 	/**
diff --git a/classes/Customer.php b/classes/Customer.php
index f8a01c5ce..431d217e6 100644
--- a/classes/Customer.php
+++ b/classes/Customer.php
@@ -589,9 +589,11 @@ class CustomerCore extends ObjectModel
 	 */
 	public function updateGroup($list)
 	{
-		$this->cleanGroups();
 		if ($list && !empty($list))
+		{
+			$this->cleanGroups();
 			$this->addGroups($list);
+		}
 		else
 			$this->addGroups(array($this->id_default_group));
 	}
@@ -606,7 +608,7 @@ class CustomerCore extends ObjectModel
 		foreach ($groups as $group)
 		{
 			$row = array('id_customer' => (int)$this->id, 'id_group' => (int)$group);
-			Db::getInstance()->insert('customer_group', $row);
+			Db::getInstance()->insert('customer_group', $row, false, true, Db::INSERT_IGNORE);
 		}
 	}
 
diff --git a/classes/CustomerMessage.php b/classes/CustomerMessage.php
index ae8709d5b..18291b3ac 100644
--- a/classes/CustomerMessage.php
+++ b/classes/CustomerMessage.php
@@ -46,7 +46,7 @@ class CustomerMessageCore extends ObjectModel
 		'fields' => array(
 			'id_employee' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
 			'id_customer_thread' => array('type' => self::TYPE_INT),
-			'ip_address' => 		array('type' => self::TYPE_INT, 'validate' => 'isIp2Long'),
+			'ip_address' => 		array('type' => self::TYPE_STRING, 'validate' => 'isIp2Long', 'size' => 15),
 			'message' => 			array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml', 'required' => true, 'size' => 65000),
 			'file_name' => 			array('type' => self::TYPE_STRING),
 			'user_agent' => 		array('type' => self::TYPE_STRING),
diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index 1dc7f39a8..17acd932b 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -369,7 +369,7 @@ class DispatcherCore
 
 		// If there are several languages, get language from uri
 		if ($this->use_routes && Language::isMultiLanguageActivated())
-			if (preg_match('#^/([a-z]{2})/?#', $this->request_uri, $m))
+			if (preg_match('#^/([a-z]{2})(?:/.*)?$#', $this->request_uri, $m))
 			{
 				$_GET['isolang'] = $m[1];
 				$this->request_uri = substr($this->request_uri, 3);
diff --git a/classes/Feature.php b/classes/Feature.php
index 38e566ed0..54965e6cd 100644
--- a/classes/Feature.php
+++ b/classes/Feature.php
@@ -312,16 +312,37 @@ class FeatureCore extends ObjectModel
 	 */
 	public static function cleanPositions()
 	{
-		return Db::getInstance()->execute('
-		UPDATE `'._DB_PREFIX_.'feature` f
-		LEFT JOIN (
-			SELECT @i := @i +1 AS rank, id_feature, position 
-			FROM `'._DB_PREFIX_.'feature`
-			JOIN (SELECT @i :=1) dummy
-			ORDER by position
-		) AS f2
-		USING (id_feature)
-		SET f.position = f2.rank - 1');
+		//Reordering positions to remove "holes" in them (after delete for instance)
+		$sql = "SELECT id_feature, position FROM "._DB_PREFIX_."feature ORDER BY id_feature";
+		$db = Db::getInstance();
+		$r = $db->executeS($sql, false);
+		$shiftTable = array(); //List of update queries (one query is necessary for each "hole" in the table)
+		$currentDelta = 0;
+		$minId = 0;
+		$maxId = 0;
+		$futurePosition = 1;
+		while ($line = $db->nextRow($r)) {
+			$delta = $futurePosition - $line['position']; //Difference between current position and future position
+			if ($delta != $currentDelta) {
+				$shiftTable[] = array('minId' => $minId, 'maxId' => $maxId, 'delta' => $currentDelta);
+				$currentDelta = $delta;
+				$minId = $line['id_feature'];
+			}
+			$maxId = $line['id_feature'];
+			$futurePosition++;
+		}
+		$shiftTable[] = array('minId' => $minId, 'maxId' => $maxId, 'delta' => $currentDelta);
+		
+		//Executing generated queries
+		foreach ($shiftTable as $line) {
+			$delta = $line['delta'];
+			if ($delta == 0) continue;
+			$delta = $delta > 0 ? '+' . (int)$delta : (int)$delta;
+			$minId = (int)$line['minId'];
+			$maxId = (int)$line['maxId'];
+			$sql = "UPDATE "._DB_PREFIX_."feature SET position = position $delta WHERE id_feature >= $minId AND id_feature <= $maxId";
+			Db::getInstance()->execute($sql);
+		}
 	}
 
 	/**
diff --git a/classes/FeatureValue.php b/classes/FeatureValue.php
index 97b07476e..4580966c3 100644
--- a/classes/FeatureValue.php
+++ b/classes/FeatureValue.php
@@ -128,30 +128,36 @@ class FeatureValueCore extends ObjectModel
 				return $tab['value'];
 	}
 
-	public static function addFeatureValueImport($id_feature, $value, $id_product = null, $id_lang = null)
+	public static function addFeatureValueImport($id_feature, $value, $id_product = null, $id_lang = null, $custom = false)
 	{
+		$id_feature_value = false;
 		if (!is_null($id_product) && $id_product)
 		{
 			$id_feature_value = Db::getInstance()->getValue('
-				SELECT `id_feature_value`
-				FROM '._DB_PREFIX_.'feature_product
-				WHERE `id_feature` = '.(int)$id_feature.'
-				AND `id_product` = '.(int)$id_product);
+				SELECT fp.`id_feature_value`
+				FROM '._DB_PREFIX_.'feature_product fp
+				INNER JOIN '._DB_PREFIX_.'feature_value fv USING (`id_feature_value`)
+				WHERE fp.`id_feature` = '.(int)$id_feature.'
+				AND fv.`custom` = '.(int)$custom.'
+				AND fp.`id_product` = '.(int)$id_product);
 
-			if ($id_feature_value && !is_null($id_lang) && $id_lang)
+			if ($custom && $id_feature_value && !is_null($id_lang) && $id_lang)
 				Db::getInstance()->execute('
 				UPDATE '._DB_PREFIX_.'feature_value_lang 
 				SET `value` = \''.pSQL($value).'\' 
 				WHERE `id_feature_value` = '.(int)$id_feature_value.' 
+				AND `value` != \''.pSQL($value).'\' 
 				AND `id_lang` = '.(int)$id_lang);
 		}
-		else
+		
+		if (!$custom)		
 			$id_feature_value = Db::getInstance()->getValue('
 				SELECT fv.`id_feature_value`
 				FROM '._DB_PREFIX_.'feature_value fv
-				LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.`id_feature_value` = fv.`id_feature_value`)
+				LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.`id_feature_value` = fv.`id_feature_value` AND fvl.`id_lang` = '.(int)$id_lang.')
 				WHERE `value` = \''.pSQL($value).'\'
 				AND fv.`id_feature` = '.(int)$id_feature.'
+				AND fv.`custom` = 0
 				GROUP BY fv.`id_feature_value`');
 
 		if ($id_feature_value)
@@ -160,7 +166,7 @@ class FeatureValueCore extends ObjectModel
 		// Feature doesn't exist, create it
 		$feature_value = new FeatureValue();
 		$feature_value->id_feature = (int)$id_feature;
-		$feature_value->custom = 0;
+		$feature_value->custom = (bool)$custom;
 		foreach (Language::getLanguages() as $language)
 			$feature_value->value[$language['id_lang']] = $value;
 		$feature_value->add();
diff --git a/classes/FileUploader.php b/classes/FileUploader.php
index be70593df..9c3758244 100755
--- a/classes/FileUploader.php
+++ b/classes/FileUploader.php
@@ -102,6 +102,11 @@ class QqUploadedFileForm
 			$image = new Image();
 			$image->id_product = (int)$product->id;
 			$image->position = Image::getHighestPosition($product->id) + 1;
+			$legends = Tools::getValue('legend');
+			if (is_array($legends))
+				foreach ($legends as $key => $legend)
+					if (!empty($legend))
+						$image->legend[(int)$key] = $legend;
 			if (!Image::getCover($image->id_product))
 				$image->cover = 1;
 			else
@@ -136,7 +141,7 @@ class QqUploadedFileForm
 
 		if (!$image->update())
 			return array('error' => Tools::displayError('Error while updating status'));
-		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName());
+		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName(), 'legend' => $image->legend);
 		return array('success' => $img);
 	}
 
@@ -184,6 +189,11 @@ class QqUploadedFileXhr
 			$image = new Image();
 			$image->id_product = (int)($product->id);
 			$image->position = Image::getHighestPosition($product->id) + 1;
+			$legends = Tools::getValue('legend');
+			if (is_array($legends))
+				foreach ($legends as $key => $legend)
+					if (!empty($legend))
+						$image->legend[(int)$key] = $legend;
 			if (!Image::getCover($image->id_product))
 				$image->cover = 1;
 			else
@@ -223,7 +233,7 @@ class QqUploadedFileXhr
 
 		if (!$image->update())
 			return array('error' => Tools::displayError('Error while updating status'));
-		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName());
+		$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName(), 'legend' => $image->legend);
 		return array('success' => $img);
 	}
 
diff --git a/classes/Group.php b/classes/Group.php
index 3e494f8ff..08893046f 100644
--- a/classes/Group.php
+++ b/classes/Group.php
@@ -325,7 +325,7 @@ class GroupCore extends ObjectModel
 	  * @param boolean $unrestricted allows search without lang and includes first group and exact match
 	  * @return array Corresponding groupes
 	  */
-	public static function searchByName($id_lang, $query)
+	public static function searchByName($query)
 	{
 		return Db::getInstance()->getRow('
 			SELECT g.*, gl.*
diff --git a/classes/Hook.php b/classes/Hook.php
index 47112546c..e8168d7b7 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -56,6 +56,8 @@ class HookCore extends ObjectModel
 	 */
 	public static $executed_hooks = array();
 
+	public static $native_module;
+
 	/**
 	 * @see ObjectModel::$definition
 	 */
@@ -416,12 +418,19 @@ class HookCore extends ObjectModel
 		// Look on modules list
 		$altern = 0;
 		$output = '';
-						
+
+		if (!isset(Hook::$native_module))
+			Hook::$native_module = Module::getNativeModuleList();
+
 		foreach ($module_list as $array)
 		{
 			// Check errors
 			if ($id_module && $id_module != $array['id_module'])
 				continue;
+
+			if ((bool)Configuration::get('PS_DISABLE_NON_NATIVE_MODULE') && !in_array($array['module'], self::$native_module))
+				continue;
+
 			if (!($moduleInstance = Module::getInstanceByName($array['module'])))
 				continue;
 
diff --git a/classes/Image.php b/classes/Image.php
index a7ce28b2f..8761dbf17 100644
--- a/classes/Image.php
+++ b/classes/Image.php
@@ -40,6 +40,9 @@ class ImageCore extends ObjectModel
 	/** @var boolean Image is cover */
 	public $cover;
 
+	/** @var string Legend */
+	public $legend;
+
 	/** @var string image extension */
 	public $image_format = 'jpg';
 
@@ -66,6 +69,7 @@ class ImageCore extends ObjectModel
 			'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'position' => 	array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'cover' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'shop' => true),
+			'legend' => 	array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128),
 		),
 	);
 
diff --git a/classes/ImageType.php b/classes/ImageType.php
index 8c4338cc1..b13d4d6ae 100644
--- a/classes/ImageType.php
+++ b/classes/ImageType.php
@@ -127,16 +127,20 @@ class ImageTypeCore extends ObjectModel
 	 * @param string $name
 	 * @param string $type
 	 */
-	public static function getByNameNType($name, $type = null)
+	public static function getByNameNType($name, $type = null, $order = null)
 	{
-		if (!isset(self::$images_types_name_cache[$name.'_'.$type]))
+		if (!isset(self::$images_types_name_cache[$name.'_'.$type.'_'.$order]))
 		{
-			self::$images_types_name_cache[$name.'_'.$type] = Db::getInstance()->getRow('
+			self::$images_types_name_cache[$name.'_'.$type.'_'.$order] = Db::getInstance()->getRow('
 				SELECT `id_image_type`, `name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `scenes` 
 				FROM `'._DB_PREFIX_.'image_type` 
-				WHERE `name` = \''.pSQL($name).'\' '.(!is_null($type) ? 'AND `'.pSQL($type).'` = 1' : ''));
+				WHERE 
+				`name` LIKE \''.pSQL($name).'\''
+				.(!is_null($type) ? ' AND `'.pSQL($type).'` = 1' : '')
+				.(!is_null($order) ? ' ORDER BY `'.bqSQL($order).'` ASC' : '')
+			);
 		}
-		return self::$images_types_name_cache[$name.'_'.$type];
+		return self::$images_types_name_cache[$name.'_'.$type.'_'.$order];
 	}
 	
 	public static function getFormatedName($name)
diff --git a/classes/Logger.php b/classes/Logger.php
index ff7fb994d..f6dc77a3d 100644
--- a/classes/Logger.php
+++ b/classes/Logger.php
@@ -62,7 +62,7 @@ class	LoggerCore extends ObjectModel
 		'fields' => array(
 			'severity' => 		array('type' => self::TYPE_INT, 'validate' => 'isInt', 'required' => true),
 			'error_code' => 	array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
-			'message' => 		array('type' => self::TYPE_STRING, 'validate' => 'isMessage', 'required' => true),
+			'message' => 		array('type' => self::TYPE_STRING, 'validate' => 'isString', 'required' => true),
 			'object_id' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'id_employee' => 		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 			'object_type' =>	array('type' => self::TYPE_STRING, 'validate' => 'isName'),
diff --git a/classes/Meta.php b/classes/Meta.php
index 76933c88b..4e911fe72 100644
--- a/classes/Meta.php
+++ b/classes/Meta.php
@@ -85,11 +85,11 @@ class MetaCore extends ObjectModel
 		// Add modules controllers to list (this function is cool !)
 		foreach (glob(_PS_MODULE_DIR_.'*/controllers/front/*.php') as $file)
 		{
-			$filename = basename($file, '.php');
+			$filename = Tools::strtolower(basename($file, '.php'));
 			if ($filename == 'index')
 				continue;
 
-			$module = basename(dirname(dirname(dirname($file))));
+			$module = Tools::strtolower(basename(dirname(dirname(dirname($file)))));
 			$selected_pages[$module.' - '.$filename] = 'module-'.$module.'-'.$filename;
 		}
 
diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 3dd0072b6..0c70cbf3c 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -1139,7 +1139,7 @@ abstract class ObjectModelCore
 			{
 				$vars = get_class_vars($class_name);
 				foreach ($vars['shopIDs'] as $id_shop)
-					$or[] = ' main.id_shop = '.(int)$id_shop.' ';
+					$or[] = '(main.id_shop = '.(int)$id_shop.(isset($this->def['fields']['id_shop_group']) ? ' OR (id_shop = 0 AND id_shop_group='.(int)Shop::getGroupFromShop((int)$id_shop).')' : '').')';
 				
 				$prepend = '';
 				if (count($or))
@@ -1658,4 +1658,4 @@ abstract class ObjectModelCore
 	{
 		$this->update_fields = $fields;
 	}
-}
\ No newline at end of file
+}
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 219a5a8dd..68bec3226 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -545,6 +545,13 @@ abstract class PaymentModuleCore extends Module
 						if ($order_status->logable)
 							ProductSale::addProductSale((int)$product['id_product'], (int)$product['cart_quantity']);
 
+					// Set the order state
+					$new_history = new OrderHistory();
+					$new_history->id_order = (int)$order->id;
+					$new_history->changeIdOrderState((int)$id_order_state, $order, true);
+					$new_history->addWithemail(true, $extra_vars);
+
+					// Switch to back order if needed
 					if (Configuration::get('PS_STOCK_MANAGEMENT') && $order_detail->getStockState())
 					{
 						$history = new OrderHistory();
@@ -553,13 +560,6 @@ abstract class PaymentModuleCore extends Module
 						$history->addWithemail();
 					}
 
-					// Set order state in order history ONLY even if the "out of stock" status has not been yet reached
-					// So you migth have two order states
-					$new_history = new OrderHistory();
-					$new_history->id_order = (int)$order->id;
-					$new_history->changeIdOrderState((int)$id_order_state, $order, true);
-					$new_history->addWithemail(true, $extra_vars);
-
 					unset($order_detail);
 
 					// Order is reloaded because the status just changed
diff --git a/classes/Product.php b/classes/Product.php
index 74b4f5372..17a5098ab 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -3623,6 +3623,7 @@ class ProductCore extends ObjectModel
 					if ($result3)
 					{
 						$result3['id_feature_value'] = $new_id_feature_value;
+						$result3['value'] = pSQL($result3['value']);
 						$return &= Db::getInstance()->insert('feature_value_lang', $result3);
 					}
 				}
diff --git a/classes/ProductSale.php b/classes/ProductSale.php
index 7c93c4147..bf8a867e0 100644
--- a/classes/ProductSale.php
+++ b/classes/ProductSale.php
@@ -74,11 +74,22 @@ class ProductSaleCore
 		$groups = FrontController::getCurrentCustomerGroups();
 		$sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
 		$interval = Validate::isUnsignedInt(Configuration::get('PS_NB_DAYS_NEW_PRODUCT')) ? Configuration::get('PS_NB_DAYS_NEW_PRODUCT') : 20;
+
+		//Subquery: get product ids in a separate query to (greatly!) improve performances and RAM usage
+		$sql = 'SELECT cp.`id_product`
+				FROM `'._DB_PREFIX_.'category_group` cg
+				LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_category` = cg.`id_category`)
+				WHERE cg.`id_group` '.$sql_groups;
+		$products = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+		$ids = array();
+		foreach ($products as $product)
+			$ids[$product['id_product']] = 1;
+		$ids = array_keys($ids);
+		sort($ids);
+		$ids = count($ids) > 0 ? implode(',', $ids) : 'NULL';
 		
-		$prefix = '';
+		//Main query
 		if ($order_by == 'date_add')
-			$prefix = 'p.';
-		
 		$sql = 'SELECT p.*, product_shop.*, stock.out_of_stock, IFNULL(stock.quantity, 0) as quantity,
 					pl.`description`, pl.`description_short`, pl.`link_rewrite`, pl.`meta_description`,
 					pl.`meta_keywords`, pl.`meta_title`, pl.`name`,
@@ -103,13 +114,8 @@ class ProductSaleCore
 				LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`)
 				'.Product::sqlStock('p').'
 				WHERE product_shop.`active` = 1
-					AND product_shop.`visibility` != \'none\'
-					AND p.`id_product` IN (
-						SELECT cp.`id_product`
-						FROM `'._DB_PREFIX_.'category_group` cg
-						LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_category` = cg.`id_category`)
-						WHERE cg.`id_group` '.$sql_groups.'
-					)
+					AND p.`visibility` != \'none\'
+					AND p.`id_product` IN ('.$ids.')
 				GROUP BY product_shop.id_product
 				ORDER BY '.(!empty($order_table) ? '`'.pSQL($order_table).'`.' : '').'`'.pSQL($order_by).'` '.pSQL($order_way).'
 				LIMIT '.(int)($page_number * $nb_products).', '.(int)$nb_products;
@@ -141,16 +147,27 @@ class ProductSaleCore
 		$groups = FrontController::getCurrentCustomerGroups();
 		$sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');
 
+		//Subquery: get product ids in a separate query to (greatly!) improve performances and RAM usage
+		$sql = 'SELECT cp.`id_product`
+		FROM `'._DB_PREFIX_.'category_group` cg
+		LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_category` = cg.`id_category`)
+		WHERE cg.`id_group` '.$sql_groups.' AND cp.`id_product` IS NOT NULL';
+		$products = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+		$ids = array();
+		foreach ($products as $product)
+			$ids[$product['id_product']] = 1;
+		$ids = array_keys($ids);
+		sort($ids);
+		$ids = count($ids) > 0 ? implode(',', $ids) : 'NULL';
+
+		//Main query
 		$sql = 'SELECT p.id_product,  MAX(product_attribute_shop.id_product_attribute) id_product_attribute, pl.`link_rewrite`, pl.`name`, pl.`description_short`, MAX(image_shop.`id_image`) id_image, il.`legend`,
 					ps.`quantity` AS sales, p.`ean13`, p.`upc`, cl.`link_rewrite` AS category, p.show_price, p.available_for_order, IFNULL(stock.quantity, 0) as quantity, p.customizable,
 					IFNULL(pa.minimal_quantity, p.minimal_quantity) as minimal_quantity, stock.out_of_stock
 				FROM `'._DB_PREFIX_.'product_sale` ps
 				LEFT JOIN `'._DB_PREFIX_.'product` p ON ps.`id_product` = p.`id_product`
 				'.Shop::addSqlAssociation('product', 'p').'
-				LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa
-				ON (p.`id_product` = pa.`id_product`)
-				'.Shop::addSqlAssociation('product_attribute', 'pa', false, 'product_attribute_shop.`default_on` = 1').'
-				'.Product::sqlStock('p', 'product_attribute_shop', false, $context->shop).'
+				LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (ps.`id_product` = pa.`id_product` AND pa.default_on = 1)
 				LEFT JOIN `'._DB_PREFIX_.'product_lang` pl
 					ON p.`id_product` = pl.`id_product`
 					AND pl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').'
@@ -161,13 +178,8 @@ class ProductSaleCore
 					ON cl.`id_category` = product_shop.`id_category_default`
 					AND cl.`id_lang` = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('cl').'
 				WHERE product_shop.`active` = 1
-					AND product_shop.`visibility` != \'none\'
-					AND p.`id_product` IN (
-						SELECT cp.`id_product`
-						FROM `'._DB_PREFIX_.'category_group` cg
-						LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_category` = cg.`id_category`)
-						WHERE cg.`id_group` '.$sql_groups.'
-					)
+					AND p.`visibility` != \'none\'
+					AND p.`id_product` IN ('.$ids.')
 				GROUP BY product_shop.id_product
 				ORDER BY sales DESC
 				LIMIT '.(int)($page_number * $nb_products).', '.(int)$nb_products;
diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php
index 11e67f1f5..0db0c487e 100644
--- a/classes/SpecificPrice.php
+++ b/classes/SpecificPrice.php
@@ -94,7 +94,7 @@ class SpecificPriceCore extends ObjectModel
 		if (parent::add($autodate, $nullValues))
 		{
 			// Flush cache when we adding a new specific price
-			self::$_specificPriceCache = array();
+			SpecificPrice::$_specificPriceCache = array();
 			Product::flushPriceCache();
 			// Set cache of feature detachable to true
 			Configuration::updateGlobalValue('PS_SPECIFIC_PRICE_FEATURE_ACTIVE', '1');
@@ -108,7 +108,7 @@ class SpecificPriceCore extends ObjectModel
 		if (parent::update($null_values))
 		{
 			// Flush cache when we updating a new specific price
-			self::$_specificPriceCache = array();
+			SpecificPrice::$_specificPriceCache = array();
 			Product::flushPriceCache();
 			return true;
 		}
@@ -120,7 +120,7 @@ class SpecificPriceCore extends ObjectModel
 		if (parent::delete())
 		{
 			// Flush cache when we deletind a new specific price
-			self::$_specificPriceCache = array();
+			SpecificPrice::$_specificPriceCache = array();
 			Product::flushPriceCache();
 			// Refresh cache of feature detachable
 			Configuration::updateGlobalValue('PS_SPECIFIC_PRICE_FEATURE_ACTIVE', SpecificPrice::isCurrentlyUsed($this->def['table']));
@@ -180,9 +180,9 @@ class SpecificPriceCore extends ObjectModel
 		if (!SpecificPrice::isFeatureActive())
 			return explode(';', Configuration::get('PS_SPECIFIC_PRICE_PRIORITIES'));
 
-		if (!isset(self::$_cache_priorities[(int)$id_product]))
+		if (!isset(SpecificPrice::$_cache_priorities[(int)$id_product]))
 		{
-			self::$_cache_priorities[(int)$id_product] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+			SpecificPrice::$_cache_priorities[(int)$id_product] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 				SELECT `priority`, `id_specific_price_priority`
 				FROM `'._DB_PREFIX_.'specific_price_priority`
 				WHERE `id_product` = '.(int)$id_product.'
@@ -190,7 +190,7 @@ class SpecificPriceCore extends ObjectModel
 			');
 		}
 
-		$priority = self::$_cache_priorities[(int)$id_product];
+		$priority = SpecificPrice::$_cache_priorities[(int)$id_product];
 
 	    if (!$priority)
 	        $priority = Configuration::get('PS_SPECIFIC_PRICE_PRIORITIES');
@@ -209,11 +209,11 @@ class SpecificPriceCore extends ObjectModel
 		*/
 
 		$key = ((int)$id_product.'-'.(int)$id_shop.'-'.(int)$id_currency.'-'.(int)$id_country.'-'.(int)$id_group.'-'.(int)$quantity.'-'.(int)$id_product_attribute.'-'.(int)$id_cart.'-'.(int)$id_customer.'-'.(int)$real_quantity);
-		if (!array_key_exists($key, self::$_specificPriceCache))
+		if (!array_key_exists($key, SpecificPrice::$_specificPriceCache))
 		{
 			$now = date('Y-m-d H:i:s');
-			self::$_specificPriceCache[$key] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
-				SELECT *, '.SpecificPrice::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group, $id_customer).'
+			$query = '
+			SELECT *, '.SpecificPrice::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group, $id_customer).'
 				FROM `'._DB_PREFIX_.'specific_price`
 				WHERE `id_product` IN (0, '.(int)$id_product.')
 				AND `id_product_attribute` IN (0, '.(int)$id_product_attribute.')
@@ -228,11 +228,22 @@ class SpecificPriceCore extends ObjectModel
 					AND
 					(`to` = \'0000-00-00 00:00:00\' OR \''.$now.'\' <= `to`)
 				)
-				AND id_cart IN (0, '.(int)$id_cart.')'.
-				(($real_quantity != 0 && !Configuration::get('PS_QTY_DISCOUNT_ON_COMBINATION')) ? ' AND IF(`from_quantity` > 1, `from_quantity`, 0) <= IF(id_product_attribute=0,'.(int)$quantity.' ,'.(int)$real_quantity.')' : 'AND `from_quantity` <= '.max(1, (int)$real_quantity)).'
-				ORDER BY `id_product_attribute` DESC, `from_quantity` DESC, `id_specific_price_rule` ASC, `score` DESC');
+				AND id_cart IN (0, '.(int)$id_cart.') ';
+
+			if ($real_quantity != 0 && !Configuration::get('PS_QTY_DISCOUNT_ON_COMBINATION'))
+				$query .= ' AND IF(`from_quantity` > 1, `from_quantity`, 0) <= IF(id_product_attribute=0,'.(int)$quantity.' ,'.(int)$real_quantity.')';
+			else
+			{
+				$qty_to_use = $id_cart ? (int)$quantity : (int)$real_quantity;
+				$query .= 'AND `from_quantity` <= '.max(1, $qty_to_use);
+			}
+
+			$query .= ' ORDER BY `id_product_attribute` DESC, `from_quantity` DESC, `id_specific_price_rule` ASC, `score` DESC';
+			
+			SpecificPrice::$_specificPriceCache[$key] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($query);
+				
 		}
-		return self::$_specificPriceCache[$key];
+		return SpecificPrice::$_specificPriceCache[$key];
 	}
 
 	public static function setPriorities($priorities)
diff --git a/classes/Tools.php b/classes/Tools.php
index c07a28ee7..44bd53e46 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -357,13 +357,11 @@ class ToolsCore
 			if (Validate::isLanguageIsoCode($string))
 			{
 				$lang = new Language(Language::getIdByIso($string));
-				if (Validate::isLoadedObject($lang) && $lang->active)
-				{				
-					$language = new Language((int)$lang->id);
-					if (Validate::isLoadedObject($language))
-						Context::getContext()->language = $language;				
+				if (Validate::isLoadedObject($lang) && $lang->active && $lang->isAssociatedToShop())
+				{
+					Context::getContext()->language = $lang;
 					$cookie->id_lang = (int)$lang->id;
-				}					
+				}
 			}
 		}
 		
@@ -674,14 +672,20 @@ class ToolsCore
 	public static function htmlentitiesUTF8($string, $type = ENT_QUOTES)
 	{
 		if (is_array($string))
-			return array_map(array('Tools', 'htmlentitiesUTF8'), $string);
+		{
+			$string = array_map(array('Tools', 'htmlentitiesUTF8'), $string);
+			return (string)array_shift($string);
+		}
 		return htmlentities((string)$string, $type, 'utf-8');
 	}
 
 	public static function htmlentitiesDecodeUTF8($string)
 	{
 		if (is_array($string))
-			return array_map(array('Tools', 'htmlentitiesDecodeUTF8'), $string);
+		{
+			$string = array_map(array('Tools', 'htmlentitiesDecodeUTF8'), $string);
+			return (string)array_shift($string);
+		}
 		return html_entity_decode((string)$string, ENT_QUOTES, 'utf-8');
 	}
 
@@ -1107,63 +1111,94 @@ class ToolsCore
 		/* One source among others:
 			http://www.tachyonsoft.com/uc0000.htm
 			http://www.tachyonsoft.com/uc0001.htm
+			http://www.tachyonsoft.com/uc0004.htm
 		*/
 		$patterns = array(
 
 			/* Lowercase */
-			/* a */ '/[\x{00E0}\x{00E1}\x{00E2}\x{00E3}\x{00E4}\x{00E5}\x{0101}\x{0103}\x{0105}]/u',
-			/* c */ '/[\x{00E7}\x{0107}\x{0109}\x{010D}]/u',
-			/* d */ '/[\x{010F}\x{0111}]/u',
-			/* e */ '/[\x{00E8}\x{00E9}\x{00EA}\x{00EB}\x{0113}\x{0115}\x{0117}\x{0119}\x{011B}]/u',
-			/* g */ '/[\x{011F}\x{0121}\x{0123}]/u',
-			/* h */ '/[\x{0125}\x{0127}]/u',
-			/* i */ '/[\x{00EC}\x{00ED}\x{00EE}\x{00EF}\x{0129}\x{012B}\x{012D}\x{012F}\x{0131}]/u',
-			/* j */ '/[\x{0135}]/u',
-			/* k */ '/[\x{0137}\x{0138}]/u',
-			/* l */ '/[\x{013A}\x{013C}\x{013E}\x{0140}\x{0142}]/u',
-			/* n */ '/[\x{00F1}\x{0144}\x{0146}\x{0148}\x{0149}\x{014B}]/u',
-			/* o */ '/[\x{00F2}\x{00F3}\x{00F4}\x{00F5}\x{00F6}\x{00F8}\x{014D}\x{014F}\x{0151}]/u',
-			/* r */ '/[\x{0155}\x{0157}\x{0159}]/u',
-			/* s */ '/[\x{015B}\x{015D}\x{015F}\x{0161}]/u',
-			/* ss*/ '/[\x{00DF}]/u',
-			/* t */ '/[\x{0163}\x{0165}\x{0167}]/u',
-			/* u */ '/[\x{00F9}\x{00FA}\x{00FB}\x{00FC}\x{0169}\x{016B}\x{016D}\x{016F}\x{0171}\x{0173}]/u',
-			/* w */ '/[\x{0175}]/u',
-			/* y */ '/[\x{00FF}\x{0177}\x{00FD}]/u',
-			/* z */ '/[\x{017A}\x{017C}\x{017E}]/u',
-			/* ae*/ '/[\x{00E6}]/u',
-			/* oe*/ '/[\x{0153}]/u',
+			/* a  */ '/[\x{00E0}\x{00E1}\x{00E2}\x{00E3}\x{00E4}\x{00E5}\x{0101}\x{0103}\x{0105}\x{0430}]/u',
+			/* b  */ '/[\x{0431}]/u',
+			/* c  */ '/[\x{00E7}\x{0107}\x{0109}\x{010D}\x{0446}]/u',
+			/* d  */ '/[\x{010F}\x{0111}\x{0434}]/u',
+			/* e  */ '/[\x{00E8}\x{00E9}\x{00EA}\x{00EB}\x{0113}\x{0115}\x{0117}\x{0119}\x{011B}\x{0435}\x{044D}]/u',
+			/* f  */ '/[\x{0444}]/u',
+			/* g  */ '/[\x{011F}\x{0121}\x{0123}\x{0433}\x{0491}]/u',
+			/* h  */ '/[\x{0125}\x{0127}]/u',
+			/* i  */ '/[\x{00EC}\x{00ED}\x{00EE}\x{00EF}\x{0129}\x{012B}\x{012D}\x{012F}\x{0131}\x{0438}\x{0456}]/u',
+			/* j  */ '/[\x{0135}\x{0439}]/u',
+			/* k  */ '/[\x{0137}\x{0138}\x{043A}]/u',
+			/* l  */ '/[\x{013A}\x{013C}\x{013E}\x{0140}\x{0142}\x{043B}]/u',
+			/* m  */ '/[\x{043C}]/u',
+			/* n  */ '/[\x{00F1}\x{0144}\x{0146}\x{0148}\x{0149}\x{014B}\x{043D}]/u',
+			/* o  */ '/[\x{00F2}\x{00F3}\x{00F4}\x{00F5}\x{00F6}\x{00F8}\x{014D}\x{014F}\x{0151}\x{043E}]/u',
+			/* p  */ '/[\x{043F}]/u',
+			/* r  */ '/[\x{0155}\x{0157}\x{0159}\x{0440}]/u',
+			/* s  */ '/[\x{015B}\x{015D}\x{015F}\x{0161}\x{0441}]/u',
+			/* ss */ '/[\x{00DF}]/u',
+			/* t  */ '/[\x{0163}\x{0165}\x{0167}\x{0442}]/u',
+			/* u  */ '/[\x{00F9}\x{00FA}\x{00FB}\x{00FC}\x{0169}\x{016B}\x{016D}\x{016F}\x{0171}\x{0173}\x{0443}]/u',
+			/* v  */ '/[\x{0432}]/u',
+			/* w  */ '/[\x{0175}]/u',
+			/* y  */ '/[\x{00FF}\x{0177}\x{00FD}\x{044B}]/u',
+			/* z  */ '/[\x{017A}\x{017C}\x{017E}\x{0437}]/u',
+			/* ae */ '/[\x{00E6}]/u',
+			/* ch */ '/[\x{0447}]/u',
+			/* kh */ '/[\x{0445}]/u',
+			/* oe */ '/[\x{0153}]/u',
+			/* sh */ '/[\x{0448}]/u',
+			/* shh*/ '/[\x{0449}]/u',
+			/* ya */ '/[\x{044F}]/u',
+			/* ye */ '/[\x{0454}]/u',
+			/* yi */ '/[\x{0457}]/u',
+			/* yo */ '/[\x{0451}]/u',
+			/* yu */ '/[\x{044E}]/u',
+			/* zh */ '/[\x{0436}]/u',
 
 			/* Uppercase */
-			/* A */ '/[\x{0100}\x{0102}\x{0104}\x{00C0}\x{00C1}\x{00C2}\x{00C3}\x{00C4}\x{00C5}]/u',
-			/* C */ '/[\x{00C7}\x{0106}\x{0108}\x{010A}\x{010C}]/u',
-			/* D */ '/[\x{010E}\x{0110}]/u',
-			/* E */ '/[\x{00C8}\x{00C9}\x{00CA}\x{00CB}\x{0112}\x{0114}\x{0116}\x{0118}\x{011A}]/u',
-			/* G */ '/[\x{011C}\x{011E}\x{0120}\x{0122}]/u',
-			/* H */ '/[\x{0124}\x{0126}]/u',
-			/* I */ '/[\x{0128}\x{012A}\x{012C}\x{012E}\x{0130}]/u',
-			/* J */ '/[\x{0134}]/u',
-			/* K */ '/[\x{0136}]/u',
-			/* L */ '/[\x{0139}\x{013B}\x{013D}\x{0139}\x{0141}]/u',
-			/* N */ '/[\x{00D1}\x{0143}\x{0145}\x{0147}\x{014A}]/u',
-			/* O */ '/[\x{00D3}\x{014C}\x{014E}\x{0150}]/u',
-			/* R */ '/[\x{0154}\x{0156}\x{0158}]/u',
-			/* S */ '/[\x{015A}\x{015C}\x{015E}\x{0160}]/u',
-			/* T */ '/[\x{0162}\x{0164}\x{0166}]/u',
-			/* U */ '/[\x{00D9}\x{00DA}\x{00DB}\x{00DC}\x{0168}\x{016A}\x{016C}\x{016E}\x{0170}\x{0172}]/u',
-			/* W */ '/[\x{0174}]/u',
-			/* Y */ '/[\x{0176}]/u',
-			/* Z */ '/[\x{0179}\x{017B}\x{017D}]/u',
-			/* AE*/ '/[\x{00C6}]/u',
-			/* OE*/ '/[\x{0152}]/u');
+			/* A  */ '/[\x{0100}\x{0102}\x{0104}\x{00C0}\x{00C1}\x{00C2}\x{00C3}\x{00C4}\x{00C5}\x{0410}]/u',
+			/* B  */ '/[\x{0411}]]/u',
+			/* C  */ '/[\x{00C7}\x{0106}\x{0108}\x{010A}\x{010C}\x{0426}]/u',
+			/* D  */ '/[\x{010E}\x{0110}\x{0414}]/u',
+			/* E  */ '/[\x{00C8}\x{00C9}\x{00CA}\x{00CB}\x{0112}\x{0114}\x{0116}\x{0118}\x{011A}\x{0415}\x{042D}]/u',
+			/* F  */ '/[\x{0424}]/u',
+			/* G  */ '/[\x{011C}\x{011E}\x{0120}\x{0122}\x{0413}\x{0490}]/u',
+			/* H  */ '/[\x{0124}\x{0126}]/u',
+			/* I  */ '/[\x{0128}\x{012A}\x{012C}\x{012E}\x{0130}\x{0418}\x{0406}]/u',
+			/* J  */ '/[\x{0134}\x{0419}]/u',
+			/* K  */ '/[\x{0136}\x{041A}]/u',
+			/* L  */ '/[\x{0139}\x{013B}\x{013D}\x{0139}\x{0141}\x{041B}]/u',
+			/* M  */ '/[\x{041C}]/u',
+			/* N  */ '/[\x{00D1}\x{0143}\x{0145}\x{0147}\x{014A}\x{041D}]/u',
+			/* O  */ '/[\x{00D3}\x{014C}\x{014E}\x{0150}\x{041E}]/u',
+			/* P  */ '/[\x{041F}]/u',
+			/* R  */ '/[\x{0154}\x{0156}\x{0158}\x{0420}]/u',
+			/* S  */ '/[\x{015A}\x{015C}\x{015E}\x{0160}\x{0421}]/u',
+			/* T  */ '/[\x{0162}\x{0164}\x{0166}\x{0422}]/u',
+			/* U  */ '/[\x{00D9}\x{00DA}\x{00DB}\x{00DC}\x{0168}\x{016A}\x{016C}\x{016E}\x{0170}\x{0172}\x{0423}]/u',
+			/* V  */ '/[\x{0412}]/u',
+			/* W  */ '/[\x{0174}]/u',
+			/* Y  */ '/[\x{0176}\x{042B}]/u',
+			/* Z  */ '/[\x{0179}\x{017B}\x{017D}\x{0417}]/u',
+			/* AE */ '/[\x{00C6}]/u',
+			/* CH */ '/[\x{0427}]/u',
+			/* KH */ '/[\x{0425}]/u',
+			/* OE */ '/[\x{0152}]/u',
+			/* SH */ '/[\x{0428}]/u',
+			/* SHH*/ '/[\x{0429}]/u',
+			/* YA */ '/[\x{042F}]/u',
+			/* YE */ '/[\x{0404}]/u',
+			/* YI */ '/[\x{0407}]/u',
+			/* YO */ '/[\x{0401}]/u',
+			/* YU */ '/[\x{042E}]/u',
+			/* ZH */ '/[\x{0416}]/u');
 			
 			// ö to oe
 			// å to aa
 			// ä to ae
 
 		$replacements = array(
-				'a', 'c', 'd', 'e', 'g', 'h', 'i', 'j', 'k', 'l', 'n', 'o', 'r', 's', 'ss', 't', 'u', 'y', 'w', 'z', 'ae', 'oe',
-				'A', 'C', 'D', 'E', 'G', 'H', 'I', 'J', 'K', 'L', 'N', 'O', 'R', 'S', 'T', 'U', 'Z', 'AE', 'OE'
+				'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'r', 's', 'ss', 't', 'u', 'v', 'w', 'y', 'z', 'ae', 'ch', 'kh', 'oe', 'sh', 'shh', 'ya', 'ye', 'yi', 'yo', 'yu', 'zh',
+				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'T', 'U', 'V', 'W', 'Y', 'Z', 'AE', 'CH', 'KH', 'OE', 'SH', 'SHH', 'YA', 'YE', 'YI', 'YO', 'YU', 'ZH'
 			);
 
 		return preg_replace($patterns, $replacements, $str);
@@ -1697,13 +1732,15 @@ class ToolsCore
 		fwrite($write_fd, "AddType application/x-font-woff .woff\n");
 
 		if ($disable_modsec)
-			fwrite($write_fd, "<IfModule mod_security.c>\nSecFilterEngine Off\nSecFilterScanPOST Off\n</IfModule>\n");
+			fwrite($write_fd, "<IfModule mod_security.c>\nSecFilterEngine Off\nSecFilterScanPOST Off\n</IfModule>\n\n");
 
 		// RewriteEngine
 		fwrite($write_fd, "<IfModule mod_rewrite.c>\n");
 
 		// Ensure HTTP_MOD_REWRITE variable is set in environment
+		fwrite($write_fd, "<IfModule mod_env.c>\n");
 		fwrite($write_fd, "SetEnv HTTP_MOD_REWRITE On\n");
+		fwrite($write_fd, "</IfModule>\n\n");
 
 		// Disable multiviews ?
 		if ($disable_multiviews)
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 96a52cf09..02f1c28fd 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -2120,7 +2120,10 @@ class AdminControllerCore extends Controller
 			$this->context->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
 		elseif ($this->context->shop->id != $shop_id)
 			$this->context->shop = new Shop($shop_id);
-
+		
+		// Replace current default country		
+		$this->context->country = new Country((int)Configuration::get('PS_COUNTRY_DEFAULT'));
+				
 		$this->initBreadcrumbs();
 	}
 
@@ -2379,8 +2382,10 @@ class AdminControllerCore extends Controller
 		if (preg_match('/[.!]/', $order_by))
 		{
 			$order_by_split = preg_split('/[.!]/', $order_by);
-			$order_by = pSQL($order_by_split[0]).'.`'.pSQL($order_by_split[1]).'`';
+			$order_by = bqSQL($order_by_split[0]).'.`'.bqSQL($order_by_split[1]).'`';
 		}
+		elseif ($order_by)
+			$order_by = '`'.bqSQL($order_by).'`';
 
 		$this->_orderWay = Tools::strtoupper($order_way);
 
@@ -2474,7 +2479,7 @@ class AdminControllerCore extends Controller
 		(isset($this->_filter) ? $this->_filter : '').$where_shop.'
 		'.(isset($this->_group) ? $this->_group.' ' : '').'
 		'.$having_clause.'
-		ORDER BY '.(($order_by == $this->identifier) ? 'a.' : '').pSQL($order_by).' '.pSQL($order_way).
+		ORDER BY '.((str_replace('`', '', $order_by) == $this->identifier) ? 'a.' : '').$order_by.' '.pSQL($order_way).
 		($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : '').
 		(($use_limit === true) ? ' LIMIT '.(int)$start.','.(int)$limit : '');
 
@@ -2526,22 +2531,20 @@ class AdminControllerCore extends Controller
 	public function getLanguages()
 	{
 		$cookie = $this->context->cookie;
-		$this->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
+		$this->allow_employee_form_lang = (int)Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG');
 		if ($this->allow_employee_form_lang && !$cookie->employee_form_lang)
-			$cookie->employee_form_lang = (int)Configuration::get('PS_LANG_DEFAULT');
-		$use_lang_from_cookie = false;
+			$cookie->employee_form_lang = (int)$this->context->language->id;
+		
+		$lang_exists = false;
 		$this->_languages = Language::getLanguages(false);
-		if ($this->allow_employee_form_lang)
-			foreach ($this->_languages as $lang)
-				if ($cookie->employee_form_lang == $lang['id_lang'])
-					$use_lang_from_cookie = true;
-		if (!$use_lang_from_cookie)
-			$this->default_form_language = (int)Configuration::get('PS_LANG_DEFAULT');
-		else
-			$this->default_form_language = (int)$cookie->employee_form_lang;
+		foreach ($this->_languages as $lang)
+			if (isset($cookie->employee_form_lang) && $cookie->employee_form_lang == $lang['id_lang'])
+				$lang_exists = true;
+
+		$this->default_form_language = $lang_exists ? (int)$cookie->employee_form_lang : (int)$this->context->language->id;
 
 		foreach ($this->_languages as $k => $language)
-			$this->_languages[$k]['is_default'] = (int)($language['id_lang'] == $this->default_form_language);
+			$this->_languages[$k]['is_default'] = ((int)($language['id_lang'] == $this->default_form_language));
 
 		return $this->_languages;
 	}
@@ -3269,4 +3272,4 @@ class AdminControllerCore extends Controller
 
 		return $return;
 	}
-}
\ No newline at end of file
+}
diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php
index 1d4760964..fe2f4af50 100755
--- a/classes/helper/Helper.php
+++ b/classes/helper/Helper.php
@@ -214,20 +214,18 @@ class HelperCore
 
 		$html = '
 		<script type="text/javascript">
-			var inputName = "'.$input_name.'";
-		';
+			var inputName = \''.addcslashes($input_name, '\'').'\';'."\n";
 		if (count($selected_cat) > 0)
 		{
 			if (isset($selected_cat[0]))
-				$html .= 'var selectedCat = "'.implode(',', $selected_cat).'";';
+				$html .= '			var selectedCat = '.(int)implode(',', $selected_cat).';'."\n";
 			else
-				$html .= 'var selectedCat = "'.implode(',', array_keys($selected_cat)).'";';
+				$html .= '			var selectedCat = '.(int)implode(',', array_keys($selected_cat)).';'."\n";
 		}
 		else
-			$html .= 'var selectedCat = "";';
-		$html .= '
-			var selectedLabel = \''.$translations['selected'].'\';
-			var home = \''.$root['name'].'\';
+			$html .= '			var selectedCat = \'\';'."\n";
+		$html .= '			var selectedLabel = \''.$translations['selected'].'\';
+			var home = \''.addcslashes($root['name'], '\'').'\';
 			var use_radio = '.(int)$use_radio.';';
 		if (!$use_in_popup)
 			$html .= '
diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php
index 05daa0f60..b3e39de51 100644
--- a/classes/helper/HelperList.php
+++ b/classes/helper/HelperList.php
@@ -455,13 +455,13 @@ class HelperListCore extends Helper
 			self::$cache_lang['Delete'] = $this->l('Delete', 'Helper');
 
 		if (!array_key_exists('DeleteItem', self::$cache_lang))
-			self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper', false, false);
+			self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper', true, false);
 
 		if (!array_key_exists('Name', self::$cache_lang))
-			self::$cache_lang['Name'] = $this->l('Name:', 'Helper', false, false);
+			self::$cache_lang['Name'] = $this->l('Name:', 'Helper', true, false);
 
 		if (!is_null($name))
-			$name = '\n\n'.self::$cache_lang['Name'].' '.$name;
+			$name = addcslashes('\n\n'.self::$cache_lang['Name'].' '.$name, '\'');
 
 		$data = array(
 			$this->identifier => $id,
@@ -470,7 +470,8 @@ class HelperListCore extends Helper
 		);
 
 		if ($this->specificConfirmDelete !== false)
-			$data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : Tools::safeOutput(addcslashes(self::$cache_lang['DeleteItem'].$name, '\''));
+			$data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : Tools::safeOutput(self::$cache_lang['DeleteItem'].$name);
+		
 		$tpl->assign(array_merge($this->tpl_delete_link_vars, $data));
 
 		return $tpl->fetch();
@@ -523,7 +524,7 @@ class HelperListCore extends Helper
 		if (Tools::getIsset($this->table.'Orderby'))
 			$order = '&'.$this->table.'Orderby='.urlencode($this->orderBy).'&'.$this->table.'Orderway='.urlencode(strtolower($this->orderWay));
 
-		$action = $this->currentIndex.$identifier.'&token='.$token.$order.'#'.$this->table;
+		$action = $this->currentIndex.$identifier.'&token='.$token.'#'.$this->table;
 
 		/* Determine current page number */
 		$page = (int)Tools::getValue('submitFilter'.$this->list_id);
diff --git a/classes/module/Module.php b/classes/module/Module.php
index f63a4f81f..96acbc67c 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1247,11 +1247,7 @@ abstract class ModuleCore
 				$module->interest = 0;
 			}
 
-		usort($module_list, create_function('$a,$b', '
-			if ($a->displayName == $b->displayName)
-				return 0;
-			return ($a->displayName < $b->displayName) ? -1 : 1;
-		'));
+		usort($module_list, create_function('$a,$b', 'return strnatcasecmp($a->displayName, $b->displayName);'));
 
 		if ($errors)
 		{
@@ -1310,6 +1306,23 @@ abstract class ModuleCore
 		return $db->executeS('SELECT * FROM `'._DB_PREFIX_.'module` m WHERE `name` NOT IN ('.implode(',', $arr_native_modules).') ');
 	}
 
+	public static function getNativeModuleList()
+	{
+		$module_list_xml = _PS_ROOT_DIR_.self::CACHE_FILE_MODULES_LIST;
+		$native_modules = simplexml_load_file($module_list_xml);
+		$native_modules = $native_modules->modules;
+		$modules = array();
+
+		foreach ($native_modules as $native_modules_type)
+			if (in_array($native_modules_type['type'], array('native', 'partner')))
+			{
+				foreach ($native_modules_type->module as $module)
+					$modules[] = $module['name'];
+			}
+
+		return $modules;
+	}
+
 	/**
 	 * Return installed modules
 	 *
@@ -1593,6 +1606,18 @@ abstract class ModuleCore
 		return Cache::retrieve('Module::isInstalled'.$module_name);
 	}
 
+	public function isEnabledForShopContext()
+	{
+		$shop_list = Shop::getContextListShopID();
+		return (bool)Db::getInstance()->getValue('
+			SELECT COUNT(*) n
+			FROM `'._DB_PREFIX_.'module_shop`
+			WHERE id_module='.(int)$this->id.' AND id_shop IN ('.implode(',', array_map('intval', Shop::getContextListShopID())).')
+			GROUP BY id_module
+			HAVING n='.(int)count(Shop::getContextListShopID())
+		);
+	}
+
 	public static function isEnabled($module_name)
 	{
 		if (!Cache::isStored('Module::isEnabled'.$module_name))
@@ -1771,6 +1796,7 @@ abstract class ModuleCore
 					@unlink($file);
 					@file_put_contents($file, $xml);
 				}
+			@chmod($file, 0664);
 		}
 	}
 
diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php
index fe4fbd578..4c4c912b0 100644
--- a/classes/order/OrderReturn.php
+++ b/classes/order/OrderReturn.php
@@ -144,6 +144,7 @@ class OrderReturnCore extends ObjectModel
 			$data[$k]['type'] = 'Return';
 			$data[$k]['tracking_number'] = $or['id_order_return'];
 			$data[$k]['can_edit'] = false;
+			$data[$k]['reference'] = Order::getUniqReferenceOf($or['id_order']);
 		}
 		return $data;
 	}
diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index 2b1320c27..98ae61c53 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -799,7 +799,7 @@ class ShopCore extends ObjectModel
 	{
 		if (Shop::getContext() == Shop::CONTEXT_SHOP)
 			$list = ($share) ? Shop::getSharedShops(Shop::getContextShopID(), $share) : array(Shop::getContextShopID());
-		else if (Shop::getContext() == Shop::CONTEXT_GROUP)
+		elseif (Shop::getContext() == Shop::CONTEXT_GROUP)
 			$list = Shop::getShops(true, Shop::getContextShopGroupID(), true);
 		else
 			$list = Shop::getShops(true, null, true);
diff --git a/classes/stock/StockMvt.php b/classes/stock/StockMvt.php
index 83bd79e08..de75d91aa 100644
--- a/classes/stock/StockMvt.php
+++ b/classes/stock/StockMvt.php
@@ -236,7 +236,10 @@ class StockMvtCore extends ObjectModel
 		$query->innerJoin('stock', 's', 's.id_stock = sm.id_stock');
 		$query->innerJoin('warehouse', 'w', 'w.id_warehouse = s.id_warehouse');
 		$query->where('sm.sign = 1');
-		$query->where('s.id_product = '.(int)$id_product.' OR s.id_product_attribute = '.(int)$id_product_attribute);
+		if ($id_product_attribute)
+			$query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute);
+		else
+			$query->where('s.id_product = '.(int)$id_product);
 		$query->orderBy('date_add DESC');
 
 		$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
diff --git a/config/alias.php b/config/alias.php
index 9c4cbb36a..7f870ef23 100644
--- a/config/alias.php
+++ b/config/alias.php
@@ -73,8 +73,10 @@ function bqSQL($string)
 
 function displayFatalError()
 {
-	$error = error_get_last();
-	if ($error !== NULL && in_array($error['type'], array(E_ERROR, E_PARSE)))
+	$error = null;
+	if (function_exists('error_get_last'))
+		$error = error_get_last();
+	if ($error !== NULL && in_array($error['type'], array(E_ERROR, E_PARSE, E_COMPILE_ERROR )))
 		echo '[PrestaShop] Fatal error in module '.substr(basename($error['file']), 0, -4).':<br />'.$error['message'];
 }
 
diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index b4b7b66aa..f21ff2bdc 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -70,7 +70,8 @@ smartyRegisterFunction($smarty, 'function', 'd', 'smartyDieObject'); // Debug on
 smartyRegisterFunction($smarty, 'function', 'l', 'smartyTranslate', false);
 smartyRegisterFunction($smarty, 'function', 'hook', 'smartyHook');
 smartyRegisterFunction($smarty, 'function', 'toolsConvertPrice', 'toolsConvertPrice');
-
+smartyRegisterFunction($smarty, 'modifier', 'json_encode', array('Tools', 'jsonEncode'));
+smartyRegisterFunction($smarty, 'modifier', 'json_decode', array('Tools', 'jsonDecode'));
 smartyRegisterFunction($smarty, 'function', 'dateFormat', array('Tools', 'dateFormat'));
 smartyRegisterFunction($smarty, 'function', 'convertPrice', array('Product', 'convertPrice'));
 smartyRegisterFunction($smarty, 'function', 'convertPriceWithCurrency', array('Product', 'convertPriceWithCurrency'));
diff --git a/controllers/admin/AdminAttachmentsController.php b/controllers/admin/AdminAttachmentsController.php
index 89cdc3ece..7732107eb 100644
--- a/controllers/admin/AdminAttachmentsController.php
+++ b/controllers/admin/AdminAttachmentsController.php
@@ -196,6 +196,8 @@ class AdminAttachmentsControllerCore extends AdminController
 							$this->errors[] = $this->l('Failed to copy the file.');
 						$_POST['file_name'] = $_FILES['file']['name'];
 						@unlink($_FILES['file']['tmp_name']);
+						if (!sizeof($this->errors) && isset($a) && file_exists(_PS_DOWNLOAD_DIR_.$a->file))
+							unlink(_PS_DOWNLOAD_DIR_.$a->file);
 						$_POST['file'] = $uniqid;
 						$_POST['mime'] = $_FILES['file']['type'];
 					}
@@ -211,11 +213,14 @@ class AdminAttachmentsControllerCore extends AdminController
 						'<b>'.$upload_mb.'</b>'
 					);
 				}
-				else if (!empty($_FILES['file']['tmp_name']))
+				else
 					$this->errors[] = $this->l('Upload error.  Please check your server configurations for the maximum upload size allowed.');
 			}
 			$this->validateRules();
 		}
-		return parent::postProcess();
+		$return = parent::postProcess();
+		if (!$return && isset($uniqid) && file_exists(_PS_DOWNLOAD_DIR_.$uniqid))
+			unlink(_PS_DOWNLOAD_DIR_.$uniqid);
+		return $return;
 	}
 }
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index 7fa198ece..fd6515f62 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -877,7 +877,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 		$step_number = Tools::getValue('step_number');
 
 		if ($step_number == 4 && !Shop::isFeatureActive() || $step_number == 5 && Shop::isFeatureActive())
-			return array();
+			return array('fields' => array());
 
 		$step_fields = array(
 			1 => array('name', 'delay', 'grade', 'url'),
@@ -896,7 +896,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 		foreach ($definition['fields'] as $field => $def)
 			if (!in_array($field, $step_fields[$step_number]))
 				unset($definition['fields'][$field]);
-		
+
 		return $definition;
 	}
 
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index fb7afb0b4..54a6fac65 100755
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -566,6 +566,8 @@ class AdminCartsControllerCore extends AdminController
 		if (count($summary['products']))
 			foreach ($summary['products'] as &$product)
 			{
+				$product['numeric_price'] = $product['price'];
+				$product['numeric_total'] = $product['total'];
 				$product['price'] = str_replace($currency->sign, '', Tools::displayPrice($product['price'], $currency));
 				$product['total'] = str_replace($currency->sign, '', Tools::displayPrice($product['total'], $currency));
 				$product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small_default');
diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php
index 3c8ce8b65..f9a0d9f1d 100644
--- a/controllers/admin/AdminCmsController.php
+++ b/controllers/admin/AdminCmsController.php
@@ -162,6 +162,26 @@ class AdminCmsControllerCore extends AdminController
 					'cols' => 40,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				),
+				array(
+					'type' => 'switch',
+					'label' => $this->l('Indexation (by search engines):'),
+					'name' => 'indexation',
+					'required' => false,
+					'class' => 't',
+					'is_bool' => true,
+					'values' => array(
+						array(
+							'id' => 'indexation_on',
+							'value' => 1,
+							'label' => $this->l('Enabled')
+						),
+						array(
+							'id' => 'indexation_off',
+							'value' => 0,
+							'label' => $this->l('Disabled')
+						)
+					),
+				),
 				array(
 					'type' => 'switch',
 					'label' => $this->l('Displayed:'),
diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php
index ed7e727fd..db24554ea 100644
--- a/controllers/admin/AdminCurrenciesController.php
+++ b/controllers/admin/AdminCurrenciesController.php
@@ -339,6 +339,8 @@ class AdminCurrenciesControllerCore extends AdminController
 		}
 		if (Tools::isSubmit('submitAddcurrency') && !Tools::getValue('id_currency') && Currency::exists(Tools::getValue('iso_code'), Tools::getValue('iso_code_num')))
 				$this->errors[] = Tools::displayError('This currency already exists.');
+		if (Tools::isSubmit('submitAddcurrency') && (float)Tools::getValue('conversion_rate') <= 0)
+				$this->errors[] = Tools::displayError('This currency conversion rate can not be equal to 0.');
 		parent::initProcess();
 	}
 
diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php
index aa5b2b22d..5f17b1f45 100644
--- a/controllers/admin/AdminCustomerThreadsController.php
+++ b/controllers/admin/AdminCustomerThreadsController.php
@@ -393,7 +393,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
 					$contact = new Contact((int)$ct->id_contact, (int)$ct->id_lang);
 					if (Validate::isLoadedObject($contact))
 					{
-						$from_name = $contact->name[(int)$ct->id_lang];
+						$from_name = $contact->name;
 						$from_email = $contact->email;
 					}
 					else
@@ -401,6 +401,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
 						$from_name = null;
 						$from_email = null;
 					}
+
 					if (Mail::Send(
 						(int)$ct->id_lang,
 						'reply_msg',
@@ -641,6 +642,12 @@ class AdminCustomerThreadsControllerCore extends AdminController
 			ENT_QUOTES, 'UTF-8')
 		);
 
+		$is_valid_order_id = true;
+		$order = new Order((int)$message['id_order']);
+
+		if (!Validate::isLoadedObject($order))
+			$is_valid_order_id = false;
+
 		$tpl->assign(array(
 			'current' => self::$currentIndex,
 			'token' => $this->token,
@@ -651,7 +658,8 @@ class AdminCustomerThreadsControllerCore extends AdminController
 			'PS_SHOP_NAME' => Configuration::get('PS_SHOP_NAME'),
 			'file_name' => file_exists(_PS_UPLOAD_DIR_.$message['file_name']),
 			'contacts' => $contacts,
-			'PS_CUSTOMER_SERVICE_SIGNATURE' => str_replace('\r\n', "\n", Configuration::get('PS_CUSTOMER_SERVICE_SIGNATURE', $message['id_lang']))
+			'PS_CUSTOMER_SERVICE_SIGNATURE' => str_replace('\r\n', "\n", Configuration::get('PS_CUSTOMER_SERVICE_SIGNATURE', $message['id_lang'])),
+			'is_valid_order_id' => $is_valid_order_id
 		));
 
 		return $tpl->fetch();
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index 7f05ad2be..ddf2de410 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -308,7 +308,7 @@ class AdminCustomersControllerCore extends AdminController
 					'name' => 'passwd',
 					'required' => ($obj->id ? false : true),
 					'col' => '4',
-					'hint' => ($obj->id ? $this->l('Leave  this field blank if there\'s no change') : $this->l('Minimum of five characters (only letters and numbers).').' -_')
+					'hint' => ($obj->id ? $this->l('Leave  this field blank if there\'s no change') : $this->l('Minimum of five characters'))
 				),
 				array(
 					'type' => 'birthday',
@@ -678,9 +678,10 @@ class AdminCustomersControllerCore extends AdminController
 			$carts[$i]['name'] = $carrier->name;
 		}
 
-		$sql = 'SELECT DISTINCT id_product, c.id_cart, c.id_shop, cp.id_shop AS cp_id_shop
+		$sql = 'SELECT DISTINCT cp.id_product, c.id_cart, c.id_shop, cp.id_shop AS cp_id_shop
 				FROM '._DB_PREFIX_.'cart_product cp
 				JOIN '._DB_PREFIX_.'cart c ON (c.id_cart = cp.id_cart)
+				JOIN '._DB_PREFIX_.'product p ON (cp.id_product = p.id_product)
 				WHERE c.id_customer = '.(int)$customer->id.'
 					AND cp.id_product NOT IN (
 							SELECT product_id
@@ -693,6 +694,8 @@ class AdminCustomersControllerCore extends AdminController
 		for ($i = 0; $i < $total_interested; $i++)
 		{
 			$product = new Product($interested[$i]['id_product'], false, $this->default_form_language, $interested[$i]['id_shop']);
+			if (!Validate::isLoadedObject($product))
+				continue;
 			$interested[$i]['url'] = $this->context->link->getProductLink(
 				$product->id,
 				$product->link_rewrite,
@@ -706,15 +709,15 @@ class AdminCustomersControllerCore extends AdminController
 		}
 
 		$connections = $customer->getLastConnections();
+		if (!is_array($connections))
+			$connections = array();
 		$total_connections = count($connections);
 		for ($i = 0; $i < $total_connections; $i++)
 		{
 			$connections[$i]['date_add'] = Tools::displayDate($connections[$i]['date_add'],null , true);
-			$connections[$i]['http_referer'] = $connections[$i]['http_referer'] ?
-													preg_replace('/^www./', '', parse_url($connections[$i]['http_referer'], PHP_URL_HOST)) :
-														$this->l('Direct link');
+			$connections[$i]['http_referer'] = $connections[$i]['http_referer'] ? preg_replace('/^www./', '', parse_url($connections[$i]['http_referer'], PHP_URL_HOST)) : $this->l('Direct link');
 		}
-
+		
 		$referrers = Referrer::getReferrers($customer->id);
 		$total_referrers = count($referrers);
 		for ($i = 0; $i < $total_referrers; $i++)
diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php
index 2ab95ac77..a6d1d1b64 100644
--- a/controllers/admin/AdminEmailsController.php
+++ b/controllers/admin/AdminEmailsController.php
@@ -63,7 +63,8 @@ class AdminEmailsControllerCore extends AdminController
 						),
 						'js' => array(
 							1 => 'onclick="$(\'#smtp\').slideUp();"', 
-							2 => 'onclick="$(\'#smtp\').slideDown();"'
+							2 => 'onclick="$(\'#smtp\').slideDown();"',
+							3 => 'onclick="$(\'#smtp\').slideUp();"'
 						),
 						'visibility' => Shop::CONTEXT_ALL
 					),
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index 466894d7a..efac48c91 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -216,7 +216,7 @@ class AdminEmployeesControllerCore extends AdminController
 					'required' => true,
 					'hint' => ($obj->id ?
 								$this->l('Leave this field blank if you do not want to change your password.') :
-									$this->l('Minimum of eight characters (use only letters and numbers)').' -_')
+									$this->l('Minimum of eight characters'))
 				),
 				array(
 					'type' => 'text',
diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php
index 010fe905f..5ab743dfc 100644
--- a/controllers/admin/AdminHomeController.php
+++ b/controllers/admin/AdminHomeController.php
@@ -303,7 +303,7 @@ class AdminHomeControllerCore extends AdminController
 
 	public function getMonthlyStatistics()
 	{
-		$currency = Tools::setCurrency($this->context->cookie);
+		$currency = Tools::setCurrency((object)array('id_currency' => null));
 		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
 			SELECT IFNULL(SUM(`total_paid_real` / conversion_rate), "0") as total_sales, COUNT(*) as total_orders
 			FROM `'._DB_PREFIX_.'orders`
@@ -400,7 +400,7 @@ class AdminHomeControllerCore extends AdminController
 			$chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']);
 		$chart->setSize(580, 170);
 		$chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd');
-		$currency = Tools::setCurrency($this->context->cookie);
+		$currency = Tools::setCurrency((object)array('id_currency' => null));
 		$chart->getCurve(1)->setLabel($this->l('Sales + Tax').' ('.strtoupper($currency->iso_code).')');
 
 		$content .= $chart->fetch();
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index d6b3e4475..5ff365c69 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -427,10 +427,11 @@ class AdminImagesControllerCore extends AdminController
 		if (!is_dir($dir))
 			return false;
 		$toDel = scandir($dir);
+
 		foreach ($toDel as $d)
 			foreach ($type as $imageType)
-				if (preg_match('/^[0-9]+\-'.($product ? '[0-9]+\-' : '').$imageType['name'].'\.jpg$/', $d) || preg_match('/^([[:lower:]]{2})\-default\-(.*)\.jpg$/', $d))
-					if (file_exists($dir.$d))
+				if (preg_match('/^[0-9]+\-'.($product ? '[0-9]+\-' : '').$imageType['name'].'\.jpg$/', $d) || preg_match('/^([[:lower:]]{2})\-default\-'.$imageType['name'].'\.jpg$/', $d))
+					if (file_exists($dir.$d))		
 						unlink($dir.$d);
 
 		// delete product images using new filesystem.
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 3fcb49bbc..521a8731f 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -89,6 +89,7 @@ class AdminImportControllerCore extends AdminController
 			$this->l('Addresses'),
 			$this->l('Manufacturers'),
 			$this->l('Suppliers'),
+			$this->l('Alias'),
 		);
 
 		// @since 1.5.0
@@ -247,13 +248,13 @@ class AdminImportControllerCore extends AdminController
 					'delete_existing_images' => array(
 						'label' => $this->l('Delete existing images (0 = No, 1 = Yes)')
 					),
-					'features' => array('label' => $this->l('Feature(Name:Value:Position)')),
+					'features' => array('label' => $this->l('Feature(Name:Value:Position:Customized)')),
 					'online_only' => array('label' => $this->l('Available online only (0 = No, 1 = Yes)')),
 					'condition' => array('label' => $this->l('Condition')),
 					'customizable' => array('label' => $this->l('Customizable (0 = No, 1 = Yes)')),
 					'uploadable_files' => array('label' => $this->l('Uploadable files (0 = No, 1 = Yes)')),
 					'text_fields' => array('label' => $this->l('Text fields (0 = No, 1 = Yes)')),
-					'out_of_stock' => array('label' => $this->l('Out_of_stock')),
+					'out_of_stock' => array('label' => $this->l('Action when out of stock')),
 					'advanced_stock_management' => array('label' => $this->l('Advanced stock management')),
 					'shop' => array(
 						'label' => $this->l('ID / Name of shop'),
@@ -306,7 +307,8 @@ class AdminImportControllerCore extends AdminController
 					'firstname' => array('label' => $this->l('First Name *')),
 					'newsletter' => array('label' => $this->l('Newsletter (0/1)')),
 					'optin' => array('label' => $this->l('Opt-in (0/1)')),
-					'group' => array('label' => $this->l('Groupe Name')),
+					'group' => array('label' => $this->l('Groups (x,y,z...)')),
+					'id_default_group' => array('label' => $this->l('Default group ID')),
 					'id_shop' => array(
 						'label' => $this->l('ID / Name of shop'),
 						'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'),
@@ -361,7 +363,6 @@ class AdminImportControllerCore extends AdminController
 					'postcode' => 'X'
 				);
 			break;
-
 			case $this->entities[$this->l('Manufacturers')]:
 			case $this->entities[$this->l('Suppliers')]:
 				//Overwrite validators AS name is not MultiLangField
@@ -383,6 +384,7 @@ class AdminImportControllerCore extends AdminController
 					'meta_title' => array('label' => $this->l('Meta title')),
 					'meta_keywords' => array('label' => $this->l('Meta keywords')),
 					'meta_description' => array('label' => $this->l('Meta description')),
+					'image' => array('label' => $this->l('Image URL')),
 					'shop' => array(
 						'label' => $this->l('ID / Name of group shop'),
 						'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'),
@@ -393,6 +395,23 @@ class AdminImportControllerCore extends AdminController
 					'shop' => Shop::getGroupFromShop(Configuration::get('PS_SHOP_DEFAULT')),
 				);
 			break;
+			case $this->entities[$this->l('Alias')]:
+				//Overwrite required_fields
+				$this->required_fields = array(
+					'alias',
+					'search',
+				);
+				$this->available_fields = array(
+					'no' => array('label' => $this->l('Ignore this column')),
+					'id' => array('label' => $this->l('ID')),
+					'alias' => array('label' => $this->l('Alias *')),
+					'search' => array('label' => $this->l('Search *')),
+					'active' => array('label' => $this->l('Active')),
+					);
+				self::$default_values = array(
+					'active' => '1',
+				);
+			break;
 		}
 		
 		// @since 1.5.0
@@ -456,9 +475,8 @@ class AdminImportControllerCore extends AdminController
 					
 			}
 
-		$this->separator = substr(strval(trim(Tools::getValue('separator', ';'))), 0, 1);
-		$this->multiple_value_separator = substr(strval(trim(Tools::getValue('multiple_value_separator', ','))), 0, 1);
-
+		$this->separator = ($separator = Tools::substr(strval(trim(Tools::getValue('separator'))), 0, 1)) ? $separator :  ';';
+		$this->multiple_value_separator = ($separator = Tools::substr(strval(trim(Tools::getValue('multiple_value_separator'))), 0, 1)) ? $separator :  ',';
 		parent::__construct();
 	}
 
@@ -508,11 +526,11 @@ class AdminImportControllerCore extends AdminController
 		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));
 
-		$separator_selected = $this->multiple_value_separator;
+		$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);
 
-		$multiple_value_separator_selected = $this->separator;
+		$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);
 
@@ -553,8 +571,8 @@ class AdminImportControllerCore extends AdminController
 
 		$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(Tools::getValue('separator'));
-		$this->context->cookie->multiple_value_separator_selected = base64_encode(Tools::getValue('multiple_value_separator'));
+		$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->tpl_view_vars = array(
@@ -633,7 +651,7 @@ class AdminImportControllerCore extends AdminController
 			$html .= '<tr id="table_'.$current_table.'_line_'.$current_line.'" style="padding: 4px">';
 			foreach ($line as $nb_c => $column)
 				if ((MAX_COLUMNS * (int)$current_table <= $nb_c) && ((int)$nb_c < MAX_COLUMNS * ((int)$current_table + 1)))
-					$html .= '<td>'.htmlentities(substr($column, 0, 200), ENT_QUOTES, 'UTF-8').'</td>';
+					$html .= '<td>'.htmlentities(Tools::substr($column, 0, 200), ENT_QUOTES, 'UTF-8').'</td>';
 			$html .= '</tr>';
 		}
 		$html .= '</table>';
@@ -676,6 +694,8 @@ class AdminImportControllerCore extends AdminController
 	protected static function rewindBomAware($handle)
 	{
 		// A rewind wrapper that skip BOM signature wrongly
+		if (!is_resource($handle))
+			return false;
 		rewind($handle);
 		if (($bom = fread($handle, 3)) != "\xEF\xBB\xBF")
 			rewind($handle);
@@ -871,6 +891,12 @@ class AdminImportControllerCore extends AdminController
 			case 'categories':
 				$path = _PS_CAT_IMG_DIR_.(int)$id_entity;
 			break;
+			case 'manufacturers':
+				$path = _PS_MANU_IMG_DIR_.(int)$id_entity;
+			break;
+			case 'suppliers':
+				$path = _PS_SUPP_IMG_DIR_.(int)$id_entity;
+			break;
 		}
 		$url = str_replace(' ', '%20', trim($url));
 
@@ -947,7 +973,7 @@ class AdminImportControllerCore extends AdminController
 			}
 			elseif (isset($category->parent) && is_string($category->parent))
 			{
-				$category_parent = Category::searchByName($default_language_id, $category->parent, true);
+				$category_parent = Category::searchByName($id_lang, $category->parent, true);
 				if ($category_parent['id_category'])
 				{
 					$category->id_parent = (int)$category_parent['id_category'];
@@ -968,7 +994,7 @@ class AdminImportControllerCore extends AdminController
 					{
 						$this->errors[] = sprintf(
 							Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
-							$category_to_create->name[$default_language_id],
+							$category_to_create->name[$id_lang],
 							(isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
 						);
 						$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
@@ -1010,8 +1036,8 @@ class AdminImportControllerCore extends AdminController
 				($lang_field_error = $category->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && empty($this->errors))
 			{
 				$category_already_created = Category::searchByNameAndParentCategoryId(
-					$default_language_id,
-					$category->name[$default_language_id],
+					$id_lang,
+					$category->name[$id_lang],
 					$category->id_parent
 				);
 
@@ -1074,11 +1100,11 @@ class AdminImportControllerCore extends AdminController
 
 					// Get shops for each attributes
 					$info['shop'] = explode($this->multiple_value_separator, $info['shop']);
-
+					
 					foreach ($info['shop'] as $shop)
-						if (!is_numeric($shop))
+						if (!empty($shop) && !is_numeric($shop))
 							$category->addShop(Shop::getIdByName($shop));
-						else
+						elseif (!empty($shop))
 							$category->addShop($shop);
 				}
 			}
@@ -1126,7 +1152,7 @@ class AdminImportControllerCore extends AdminController
 			else
 				$product = new Product();
 
-			if (array_key_exists('id', $info) && (int)$info['id'] && Product::existsInDatabase((int)$info['id'], 'product'))
+			if (isset($product->id) && $product->id && Product::existsInDatabase((int)$product->id, 'product'))
 			{
 				$product->loadStockData();
 				$category_data = Product::getProductCategories((int)$product->id);
@@ -1150,9 +1176,9 @@ class AdminImportControllerCore extends AdminController
 			// link product to shops
 			$product->id_shop_list = array();
 			foreach (explode($this->multiple_value_separator, $product->shop) as $shop)
-				if (!is_numeric($shop))
+				if (!empty($shop) && !is_numeric($shop))
 					$product->id_shop_list[] = Shop::getIdByName($shop);
-				else
+				elseif (!empty($shop))
 					$product->id_shop_list[] = $shop;
 
 			if ((int)$product->id_tax_rules_group != 0)
@@ -1275,7 +1301,7 @@ class AdminImportControllerCore extends AdminController
 					}
 					else if (is_string($value) && !empty($value))
 					{
-						$category = Category::searchByName($default_language_id, trim($value), true);
+						$category = Category::searchByName($id_lang, trim($value), true);
 						if ($category['id_category'])
 							$product->id_category[] = (int)$category['id_category'];
 						else
@@ -1393,8 +1419,10 @@ class AdminImportControllerCore extends AdminController
 			$product_shop = explode($this->multiple_value_separator, $product->shop);
 			foreach ($product_shop as $shop)
 			{
+				if (empty($shop))
+					continue;
 				$shop = trim($shop);
-				if (!is_numeric($shop))
+				if (!empty($shop) && !is_numeric($shop))
 					$shop = Shop::getIdByName($shop);
 
 				if (in_array($shop, $shop_ids))
@@ -1446,36 +1474,36 @@ class AdminImportControllerCore extends AdminController
 					
 				$id_shop_list = array();
 				foreach ($info['shop'] as $shop)
-					if (!is_numeric($shop))
+					if (!empty($shop) && !is_numeric($shop))
 						$id_shop_list[] = (int)Shop::getIdByName($shop);
-					else
+					elseif (!empty($shop))
 						$id_shop_list[] = $shop;
 
-					if ((isset($info['reduction_price']) && $info['reduction_price'] > 0) || (isset($info['reduction_percent']) && $info['reduction_percent'] > 0))
-						foreach($id_shop_list as $id_shop)
-						{
-							$specific_price = SpecificPrice::getSpecificPrice($product->id, $id_shop, 0, 0, 0, 1, 0, 0, 0, 0);
+				if ((isset($info['reduction_price']) && $info['reduction_price'] > 0) || (isset($info['reduction_percent']) && $info['reduction_percent'] > 0))
+					foreach($id_shop_list as $id_shop)
+					{
+						$specific_price = SpecificPrice::getSpecificPrice($product->id, $id_shop, 0, 0, 0, 1, 0, 0, 0, 0);
 
-							if (is_array($specific_price) && isset($specific_price['id_specific_price']))
-								$specific_price = new SpecificPrice((int)$specific_price['id_specific_price']);
-							else
-								$specific_price = new SpecificPrice();
-							$specific_price->id_product = (int)$product->id;
-							$specific_price->id_specific_price_rule = 0;
-							$specific_price->id_shop = $id_shop;
-							$specific_price->id_currency = 0;
-							$specific_price->id_country = 0;
-							$specific_price->id_group = 0;
-							$specific_price->price = -1;
-							$specific_price->id_customer = 0;
-							$specific_price->from_quantity = 1;
-							$specific_price->reduction = (isset($info['reduction_price']) && $info['reduction_price']) ? $info['reduction_price'] : $info['reduction_percent'] / 100;
-							$specific_price->reduction_type = (isset($info['reduction_price']) && $info['reduction_price']) ? 'amount' : 'percentage';
-							$specific_price->from = (isset($info['reduction_from']) && Validate::isDate($info['reduction_from'])) ? $info['reduction_from'] : '0000-00-00 00:00:00';
-							$specific_price->to = (isset($info['reduction_to']) && Validate::isDate($info['reduction_to']))  ? $info['reduction_to'] : '0000-00-00 00:00:00';
-							if (!$specific_price->save())
-								$this->addProductWarning(Tools::safeOutput($info['name']), $product->id, $this->l('Discount is invalid'));
-						}
+						if (is_array($specific_price) && isset($specific_price['id_specific_price']))
+							$specific_price = new SpecificPrice((int)$specific_price['id_specific_price']);
+						else
+							$specific_price = new SpecificPrice();
+						$specific_price->id_product = (int)$product->id;
+						$specific_price->id_specific_price_rule = 0;
+						$specific_price->id_shop = $id_shop;
+						$specific_price->id_currency = 0;
+						$specific_price->id_country = 0;
+						$specific_price->id_group = 0;
+						$specific_price->price = -1;
+						$specific_price->id_customer = 0;
+						$specific_price->from_quantity = 1;
+						$specific_price->reduction = (isset($info['reduction_price']) && $info['reduction_price']) ? $info['reduction_price'] : $info['reduction_percent'] / 100;
+						$specific_price->reduction_type = (isset($info['reduction_price']) && $info['reduction_price']) ? 'amount' : 'percentage';
+						$specific_price->from = (isset($info['reduction_from']) && Validate::isDate($info['reduction_from'])) ? $info['reduction_from'] : '0000-00-00 00:00:00';
+						$specific_price->to = (isset($info['reduction_to']) && Validate::isDate($info['reduction_to']))  ? $info['reduction_to'] : '0000-00-00 00:00:00';
+						if (!$specific_price->save())
+							$this->addProductWarning(Tools::safeOutput($info['name']), $product->id, $this->l('Discount is invalid'));
+					}
 
 				if (isset($product->tags) && !empty($product->tags))
 				{
@@ -1489,7 +1517,8 @@ class AdminImportControllerCore extends AdminController
 							if (is_array($product->tags) && count($product->tags))
 							{
 								foreach ($product->tags as $key => $tag)
-									$product->tags[$key] = trim($tag);
+									if (!empty($tag))
+										$product->tags[$key] = trim($tag);
 								$tags[$id_lang] = $product->tags;
 								$product->tags = $tags;
 							}
@@ -1497,7 +1526,7 @@ class AdminImportControllerCore extends AdminController
 					}
 					// Delete tags for this id product, for no duplicating error
 					Tag::deleteTagsForProduct($product->id);
-					if (!is_array($product->tags))
+					if (!is_array($product->tags) && !empty($product->tags))
 					{
 						$product->tags = AdminImportController::createMultiLangField($product->tags);
 						foreach ($product->tags as $key => $tags)
@@ -1581,14 +1610,20 @@ class AdminImportControllerCore extends AdminController
 				if (isset($features['features']) && !empty($features['features']))
 					foreach (explode($this->multiple_value_separator, $features['features']) as $single_feature)
 					{
+						if (empty($single_feature))
+							continue;
 						$tab_feature = explode(':', $single_feature);
-						$feature_name = trim($tab_feature[0]);
-						$feature_value = trim($tab_feature[1]);
-						$position = isset($tab_feature[2]) ? $tab_feature[2]: false;
+						$feature_name = isset($tab_feature[0]) ? trim($tab_feature[0]) : '';
+						$feature_value = isset($tab_feature[1]) ? trim($tab_feature[1]) : '';
+						$position = isset($tab_feature[2]) ? (int)$tab_feature[2] : false;
+						$custom = isset($tab_feature[3]) ? (int)$tab_feature[3] : false;
 						if(!empty($feature_name) && !empty($feature_value))
 						{
-							$id_feature = Feature::addFeatureImport($feature_name, $position);
-							$id_feature_value = FeatureValue::addFeatureValueImport($id_feature, $feature_value, $product->id, $id_lang);
+							$id_feature = (int)Feature::addFeatureImport($feature_name, $position);
+							$id_product = null;
+							if (Tools::getValue('forceIDs') || Tools::getValue('match_ref'))
+								$id_product = (int)$product->id;
+							$id_feature_value = (int)FeatureValue::addFeatureValueImport($id_feature, $feature_value, $id_product, $id_lang, $custom);
 							Product::addFeatureProductImport($product->id, $id_feature, $id_feature_value);
 						}
 					}
@@ -1606,7 +1641,6 @@ class AdminImportControllerCore extends AdminController
 				StockAvailable::setQuantity((int)$product->id, 0, $product->quantity, $this->context->shop->id);
 
 		}
-
 		$this->closeCsvFile($handle);
 	}
 
@@ -1646,11 +1680,12 @@ class AdminImportControllerCore extends AdminController
 			$info['shop'] = explode($this->multiple_value_separator, $info['shop']);
 				
 			$id_shop_list = array();
-			foreach ($info['shop'] as $shop)
-				if (!is_numeric($shop))
-					$id_shop_list[] = Shop::getIdByName($shop);
-				else
-					$id_shop_list[] = $shop;
+			if (is_array($info['shop']) && count($info['shop']))
+				foreach ($info['shop'] as $shop)
+					if (!empty($shop) && !is_numeric($shop))
+						$id_shop_list[] = Shop::getIdByName($shop);
+					elseif (!empty($shop))
+						$id_shop_list[] = $shop;
 			
 			if(isset($info['id_product']))
 				$product = new Product((int)$info['id_product'], false, $default_language);
@@ -1724,12 +1759,14 @@ class AdminImportControllerCore extends AdminController
 			if(isset($info['group']))
 				foreach (explode($this->multiple_value_separator, $info['group']) as $key => $group)
 				{
+					if (empty($group))
+						continue;
 					$tab_group = explode(':', $group);
 					$group = trim($tab_group[0]);
 					if (!isset($tab_group[1]))
 						$type = 'select';
 					else
-					$type = trim($tab_group[1]);
+						$type = trim($tab_group[1]);
 	
 					// sets group
 					$groups_attributes[$key]['group'] = $group;
@@ -1779,6 +1816,8 @@ class AdminImportControllerCore extends AdminController
 			if(isset($info['attribute']))
 				foreach (explode($this->multiple_value_separator, $info['attribute']) as $key => $attribute)
 				{
+					if (empty($attribute))
+						continue;
 					$tab_attribute = explode(':', $attribute);
 					$attribute = trim($tab_attribute[0]);
 					// if position is filled
@@ -1925,6 +1964,9 @@ class AdminImportControllerCore extends AdminController
 		$this->receiveTab();
 		$handle = $this->openCsvFile();
 		$default_language_id = (int)Configuration::get('PS_LANG_DEFAULT');
+		$id_lang = Language::getIdByIso(Tools::getValue('iso_lang'));
+		if (!Validate::isUnsignedId($id_lang))
+			$id_lang = $default_language_id;
 		AdminImportController::setLocale();
 		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++)
 		{
@@ -1952,31 +1994,45 @@ class AdminImportControllerCore extends AdminController
 				$customer_exist = true;
 				$customer_groups = $customer->getGroups();
 				$addresses = $customer->getAddresses((int)Configuration::get('PS_LANG_DEFAULT'));
-				foreach ($customer_groups as $key => $group)
-					if ($group == $customer->id_default_group)
-						unset($customer_groups[$key]);
 			}
 
 			// Group Importation
 			if (isset($info['group']) && !empty($info['group']))
 			{
-				if (!isset($customer_groups))
-					$customer_groups = array();
-
-				$myGroup = Group::searchByName($default_language_id, $info['group']);
-
-				if (!$myGroup)
+				foreach (explode($this->multiple_value_separator, $info['group']) as $key => $group)
 				{
-					$myGroup = new Group();
-					$myGroup->name = Array($default_language_id => $info['group']);
-					$myGroup->price_display_method = 1;
-					$myGroup->add();
-					$myGroup = Group::searchByName($default_language_id, $info['group']);
+					$group = trim($group);
+					if(empty($group))
+						continue;
+					$id_group = false;
+					if (is_numeric($group) && $group)
+					{
+						$myGroup = new Group((int)$group);
+						if (Validate::isLoadedObject($myGroup))
+							$customer_groups[] = (int)$group;
+						continue;
+					}						
+					$myGroup = Group::searchByName($group);
+					if (isset($myGroup['id_group']) && $myGroup['id_group'])
+						$id_group = (int)$myGroup['id_group'];
+					if (!$id_group)
+					{
+						$myGroup = new Group();
+						$myGroup->name = Array($id_lang => $group);
+						if ($id_lang != $default_language_id)
+							$myGroup->name = array_merge($myGroup->name, array($default_language_id => $group));
+						$myGroup->price_display_method = 1;
+						$myGroup->add();
+						if (Validate::isLoadedObject($myGroup))
+							$id_group = (int)$myGroup->id;
+					}
+					if ($id_group)
+						$customer_groups[] = (int)$id_group;
 				}
-				if (isset($myGroup['0']['id_group']))
-					$customer_groups[] = $myGroup['0']['id_group'];
 			}
-
+			elseif(empty($info['group']) && isset($customer->id) && $customer->id)
+				$customer_groups = array(0 => Configuration::get('PS_CUSTOMER_GROUP'));
+				
 			AdminImportController::arrayWalk($info, array('AdminImportController', 'fillInfo'), $customer);
 
 			if ($customer->passwd)
@@ -1990,6 +2046,8 @@ class AdminImportControllerCore extends AdminController
 			{
 				foreach ($id_shop_list as $id_shop)
 				{
+					if (empty($id_shop))
+						continue;
 					$shop = new Shop((int)$id_shop);
 					$group_shop = $shop->getGroup();
 					if ($group_shop->share_customer)
@@ -2011,7 +2069,18 @@ class AdminImportControllerCore extends AdminController
 			//set temporally for validate field
 			$customer->id_shop = $default_shop->id;
 			$customer->id_shop_group = $default_shop->getGroup()->id;
-
+			if (isset($info['id_default_group']) && !empty($info['id_default_group']) && !is_numeric($info['id_default_group']))
+			{
+				$info['id_default_group'] = trim($info['id_default_group']);
+				$myGroup = Group::searchByName($info['id_default_group']);
+				if (isset($myGroup['id_group']) && $myGroup['id_group'])
+					$info['id_default_group'] = (int)$myGroup['id_group'];
+			}
+			$myGroup = new Group($customer->id_default_group);
+			if (!Validate::isLoadedObject($myGroup))
+				$customer->id_default_group = (int)Configuration::get('PS_CUSTOMER_GROUP');
+			$customer_groups[] = (int)$customer->id_default_group;
+			$customer_groups = array_flip(array_flip($customer_groups));
 			$res = true;
 			if (($field_error = $customer->validateFields(UNFRIENDLY_ERROR, true)) === true &&
 				($lang_field_error = $customer->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
@@ -2029,12 +2098,9 @@ class AdminImportControllerCore extends AdminController
 								$customer->id = $current_id_customer;
 								$res &= $customer->update();
 							}
-
 							else
 							{
 								$res &= $customer->add();
-								if (isset($customer_groups))
-									$customer->addGroups($customer_groups);
 								if (isset($addresses))
 									foreach ($addresses as $address)
 									{
@@ -2043,6 +2109,8 @@ class AdminImportControllerCore extends AdminController
 										Db::getInstance()->insert('address', $address);
 									}
 							}
+							if ($res && isset($customer_groups))
+								$customer->updateGroup($customer_groups);
 						}
 					}
 					else
@@ -2057,8 +2125,6 @@ class AdminImportControllerCore extends AdminController
 						else
 						{
 							$res &= $customer->add();
-							if (isset($customer_groups))
-									$customer->addGroups($customer_groups);
 							if (isset($addresses))
 								foreach ($addresses as $address)
 								{
@@ -2067,9 +2133,12 @@ class AdminImportControllerCore extends AdminController
 									Db::getInstance()->insert('address', $address);
 								}
 						}
+						if ($res && isset($customer_groups))
+							$customer->updateGroup($customer_groups);
 					}
 				}
 			}
+			unset($customer_groups);
 			$customer_exist = false;
 			if (!$res)
 			{
@@ -2116,7 +2185,7 @@ class AdminImportControllerCore extends AdminController
 					$country->active = 1;
 					$country->name = AdminImportController::createMultiLangField($address->country);
 					$country->id_zone = 0; // Default zone for country to create
-					$country->iso_code = strtoupper(substr($address->country, 0, 2)); // Default iso for country to create
+					$country->iso_code = Tools::strtoupper(Tools::substr($address->country, 0, 2)); // Default iso for country to create
 					$country->contains_states = 0; // Default value for country to create
 					$lang_field_error = $country->validateFieldsLang(UNFRIENDLY_ERROR, true);
 					if (($field_error = $country->validateFields(UNFRIENDLY_ERROR, true)) === true &&
@@ -2147,7 +2216,7 @@ class AdminImportControllerCore extends AdminController
 					$state->name = $address->state;
 					$state->id_country = isset($country->id) ? (int)$country->id : 0;
 					$state->id_zone = 0; // Default zone for state to create
-					$state->iso_code = strtoupper(substr($address->state, 0, 2)); // Default iso for state to create
+					$state->iso_code = Tools::strtoupper(Tools::substr($address->state, 0, 2)); // Default iso for state to create
 					$state->tax_behavior = 0;
 					if (($field_error = $state->validateFields(UNFRIENDLY_ERROR, true)) === true &&
 						($lang_field_error = $state->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $state->add())
@@ -2332,6 +2401,11 @@ class AdminImportControllerCore extends AdminController
 				if (!$res)
 					$res = $manufacturer->add();
 
+				//copying images of manufacturer
+				if (isset($manufacturer->image) && !empty($manufacturer->image))
+				if (!AdminImportController::copyImg($manufacturer->id, null, $manufacturer->image, 'manufacturers', !Tools::getValue('regenerate')))
+					$this->warnings[] = $manufacturer->image.' '.Tools::displayError('cannot be copied.');
+
 				if ($res)
 				{
 					// Associate supplier to group shop
@@ -2345,6 +2419,8 @@ class AdminImportControllerCore extends AdminController
 						$shops = array();
 						foreach ($manufacturer->shop as $shop)
 						{
+							if (empty($shop))
+								continue;
 							$shop = trim($shop);
 							if (!is_numeric($shop))
 								$shop = ShopGroup::getIdByName($shop);
@@ -2403,6 +2479,11 @@ class AdminImportControllerCore extends AdminController
 				if (!$res)
 					$res = $supplier->add();
 
+				//copying images of suppliers
+				if (isset($supplier->image) && !empty($supplier->image))
+				if (!AdminImportController::copyImg($supplier->id, null, $supplier->image, 'suppliers', !Tools::getValue('regenerate')))
+					$this->warnings[] = $supplier->image.' '.Tools::displayError('cannot be copied.');
+
 				if (!$res)
 					$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
 						Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
@@ -2422,6 +2503,8 @@ class AdminImportControllerCore extends AdminController
 						$shops = array();
 						foreach ($supplier->shop as $shop)
 						{
+							if (empty($shop))
+								continue;
 							$shop = trim($shop);
 							if (!is_numeric($shop))
 								$shop = ShopGroup::getIdByName($shop);
@@ -2440,6 +2523,56 @@ class AdminImportControllerCore extends AdminController
 		$this->closeCsvFile($handle);
 	}
 
+	public function aliasImport()
+	{
+		$this->receiveTab();
+		$handle = $this->openCsvFile();
+		AdminImportController::setLocale();
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++)
+		{
+			if (Tools::getValue('convert'))
+				$line = $this->utf8EncodeArray($line);
+			$info = AdminImportController::getMaskedRow($line);
+
+			AdminImportController::setDefaultValues($info);
+
+			if (Tools::getValue('forceIDs') && isset($info['id']) && (int)$info['id'])
+				$alias = new Alias((int)$info['id']);
+			else
+			{
+				if (array_key_exists('id', $info) && (int)$info['id'] && Alias::existsInDatabase((int)$info['id'], 'alias'))
+					$alias = new Alias((int)$info['id']);
+				else
+					$alias = new Alias();
+			}
+
+			AdminImportController::arrayWalk($info, array('AdminImportController', 'fillInfo'), $alias);
+			
+			$res = false;
+			if (($field_error = $alias->validateFields(UNFRIENDLY_ERROR, true)) === true &&
+				($lang_field_error = $alias->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
+			{
+				if ($alias->id && $alias->aliasExists($alias->id))
+					$res = $alias->update();
+				if (!$res)
+					$res = $alias->add();
+
+				if (!$res)
+					$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
+						Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
+						$info['name'],
+						(isset($info['id']) ? $info['id'] : 'null')
+					);
+			}
+			else
+			{
+				$this->errors[] = $this->l('Alias is invalid').' ('.$alias->name.')';
+				$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '');
+			}
+		}
+		$this->closeCsvFile($handle);
+	}
+
 	/**
 	 * @since 1.5.0
 	 */
@@ -2479,34 +2612,32 @@ class AdminImportControllerCore extends AdminController
 			$date_delivery_expected = pSQL($info['date_delivery_expected']);
 			$discount_rate = (float)$info['discount_rate'];
 			$is_template = (bool)$info['is_template'];
-
+			
+			$error = '';
 			// checks parameters
 			if (!Supplier::supplierExists($id_supplier))
-				$this->errors[] = sprintf($this->l('Supplier ID (%d) is not valid (at line %d).'), $id_supplier, $current_line + 1);
+				$error = sprintf($this->l('Supplier ID (%d) is not valid (at line %d).'), $id_supplier, $current_line + 1);
 			if (!Language::getLanguage($id_lang))
-				$this->errors[] = sprintf($this->l('Lang ID (%d) is not valid (at line %d).'), $id_lang, $current_line + 1);
+				$error = sprintf($this->l('Lang ID (%d) is not valid (at line %d).'), $id_lang, $current_line + 1);
 			if (!Warehouse::exists($id_warehouse))
-				$this->errors[] = sprintf($this->l('Warehouse ID (%d) is not valid (at line %d).'), $id_warehouse, $current_line + 1);
+				$error = sprintf($this->l('Warehouse ID (%d) is not valid (at line %d).'), $id_warehouse, $current_line + 1);
 			if (!Currency::getCurrency($id_currency))
-				$this->errors[] = sprintf($this->l('Currency ID (%d) is not valid (at line %d).'), $id_currency, $current_line + 1);
+				$error = sprintf($this->l('Currency ID (%d) is not valid (at line %d).'), $id_currency, $current_line + 1);
 			if (empty($supply_order->reference) && SupplyOrder::exists($reference))
-				$this->errors[] = sprintf($this->l('Reference (%s) already exists (at line %d).'), $reference, $current_line + 1);
+				$error = sprintf($this->l('Reference (%s) already exists (at line %d).'), $reference, $current_line + 1);
 			if (!empty($supply_order->reference) && ($supply_order->reference != $reference && SupplyOrder::exists($reference)))
-				$this->errors[] = sprintf($this->l('Reference (%s) already exists (at line %d).'), $reference, $current_line + 1);
+				$error = sprintf($this->l('Reference (%s) already exists (at line %d).'), $reference, $current_line + 1);
 			if (!Validate::isDateFormat($date_delivery_expected))
-				$this->errors[] = sprintf($this->l('Date (%s) is not valid (at line %d). Format: %s.'), $date_delivery_expected,
-										   $current_line + 1, $this->l('YYYY-MM-DD'));
+				$error = sprintf($this->l('Date (%s) is not valid (at line %d). Format: %s.'), $date_delivery_expected, $current_line + 1, $this->l('YYYY-MM-DD'));
 			else if (new DateTime($date_delivery_expected) <= new DateTime('yesterday'))
-				$this->errors[] = sprintf($this->l('Date (%s) cannot be in the past (at line %d). Format: %s.'), $date_delivery_expected,
-										   $current_line + 1, $this->l('YYYY-MM-DD'));
+				$error = sprintf($this->l('Date (%s) cannot be in the past (at line %d). Format: %s.'), $date_delivery_expected, $current_line + 1, $this->l('YYYY-MM-DD'));
 			if ($discount_rate < 0 || $discount_rate > 100)
-				$this->errors[] = sprintf($this->l('Discount rate (%d) is not valid (at line %d). %s.'), $discount_rate,
-										   $current_line + 1, $this->l('Format: Between 0 and 100'));
+				$error = sprintf($this->l('Discount rate (%d) is not valid (at line %d). %s.'), $discount_rate, $current_line + 1, $this->l('Format: Between 0 and 100'));
 			if ($supply_order->id > 0 && !$supply_order->isEditable())
-				$this->errors[] = sprintf($this->l('Supply Order (%d) is not editable (at line %d).'), $supply_order->id, $current_line + 1);
+				$error = sprintf($this->l('Supply Order (%d) is not editable (at line %d).'), $supply_order->id, $current_line + 1);
 
 			// if no errors, sets supply order
-			if (empty($this->errors))
+			if (empty($error))
 			{
 				// adds parameters
 				$info['id_ref_currency'] = (int)Currency::getDefaultCurrency()->id;
@@ -2523,8 +2654,10 @@ class AdminImportControllerCore extends AdminController
 				AdminImportController::arrayWalk($info, array('AdminImportController', 'fillInfo'), $supply_order);
 
 				// updatesd($supply_order);
+
 				$res = true;
-				if ($supply_order->id > 0)
+
+				if ((int)$supply_order->id && ($supply_order->exists((int)$supply_order->id) || $supply_order->exists($supply_order->reference)))
 					$res &= $supply_order->update();
 				else
 					$res &= $supply_order->add();
@@ -2533,6 +2666,8 @@ class AdminImportControllerCore extends AdminController
 				if (!$res)
 					$this->errors[] = sprintf($this->l('Supply Order could not be saved (at line %d).'), $current_line + 1);
 			}
+			else
+				$this->errors[] = $error;
 		}
 
 		// closes
@@ -2658,6 +2793,8 @@ class AdminImportControllerCore extends AdminController
 
 	protected function getNbrColumn($handle, $glue)
 	{
+		if (!is_resource($handle))
+			return false;
 		$tmp = fgetcsv($handle, MAX_LINE_SIZE, $glue);
 		AdminImportController::rewindBomAware($handle);
 		return count($tmp);
@@ -2672,7 +2809,10 @@ class AdminImportControllerCore extends AdminController
 
 	protected function openCsvFile()
 	{
-		 $handle = fopen(_PS_ADMIN_DIR_.'/import/'.strval(preg_replace('/\.{2,}/', '.', Tools::getValue('csv'))), 'r');
+		$file = _PS_ADMIN_DIR_.'/import/'.strval(preg_replace('/\.{2,}/', '.', Tools::getValue('csv')));
+		$handle = false;
+		if (is_file($file) && is_readable($file))	
+			$handle = fopen($file, 'r');
 
 		if (!$handle)
 			$this->errors[] = Tools::displayError('Cannot read the .CSV file');
@@ -2787,6 +2927,9 @@ class AdminImportControllerCore extends AdminController
 					if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d))
 						unlink(_PS_SUPP_IMG_DIR_.$d);
 				break;
+			case $this->entities[$this->l('Alias')]:
+				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'alias`');
+				break;
 		}
 		Image::clearTmpDir();
 		return true;
@@ -2811,7 +2954,7 @@ class AdminImportControllerCore extends AdminController
 
 		if (Tools::isSubmit('submitFileUpload'))
 		{
-			$path = _PS_ADMIN_DIR_.'/import/'.date('Ymdhis').'-';
+			$path = _PS_ADMIN_DIR_.'/import/'.date('YmdHis').'-';
 			if (isset($_FILES['file']) && !empty($_FILES['file']['error']))
 			{
 				switch ($_FILES['file']['error'])
@@ -2885,6 +3028,9 @@ class AdminImportControllerCore extends AdminController
 						$this->supplierImport();
 						$this->clearSmartyCache();
 						break;
+					case $this->entities[$import_type = $this->l('Alias')]:
+						$this->aliasImport();
+						break;
 				}
 				
 				// @since 1.5.0
@@ -3002,3 +3148,4 @@ class AdminImportControllerCore extends AdminController
 		}
 	}
 }
+?>
diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php
index 9ad3a3f4d..92aa510e6 100644
--- a/controllers/admin/AdminMetaController.php
+++ b/controllers/admin/AdminMetaController.php
@@ -225,6 +225,12 @@ class AdminMetaControllerCore extends AdminController
 	public function renderForm()
 	{
 		$files = Meta::getPages(true, ($this->object->page ? $this->object->page : false));
+		
+		$is_index = false;
+		foreach ($this->object->url_rewrite as $rewrite)
+			if($is_index != true)
+				$is_index = ($this->object->page == 'index' && empty($rewrite)) ? true : false;
+
 		$pages = array(
 			'common' => array(
 				'name' => $this->l('Default pages'),
@@ -312,6 +318,7 @@ class AdminMetaControllerCore extends AdminController
 					'name' => 'url_rewrite',
 					'lang' => true,
 					'required' => true,
+					'disabled' => (bool)$is_index,
 					'hint' => array(
 						$this->l('Only letters and hyphens are allowed'),
 						$this->l('e.g. "contacts" for http://mysite.com/shop/contacts to redirect to http://mysite.com/shop/contact-form.php'),
@@ -404,7 +411,7 @@ class AdminMetaControllerCore extends AdminController
 			{
 				fwrite($write_fd, "# Directories\n");
 				foreach ($this->rb_data['Directories'] as $dir)
-					fwrite($write_fd, 'Disallow: /*'.$dir."\n");
+					fwrite($write_fd, 'Disallow: */'.$dir."\n");
 			}
 			
 			// Files
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index ff997dce6..5b43ab279 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -829,7 +829,7 @@ class AdminModulesControllerCore extends AdminController
 
 		if (count($module_errors))
 		{
-			$html_error = '<ul style="line-height:20px">';
+			$html_error = '<ul>';
 			foreach ($module_errors as $module_error)
 			{
 				$html_error_description = '';
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 3e09d03b5..19e8b30ee 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -317,7 +317,7 @@ class AdminOrdersControllerCore extends AdminController
 							'{shipping_number}' => $order->shipping_number,
 							'{order_name}' => $order->getUniqReference()
 						);
-						if (@Mail::Send((int)$order->id_lang, 'in_transit', Mail::l('Package in transit'), $templateVars,
+						if (@Mail::Send((int)$order->id_lang, 'in_transit', Mail::l('Package in transit', (int)$order->id_lang), $templateVars,
 							$customer->email, $customer->firstname.' '.$customer->lastname, null, null, null, null,
 							_PS_MAIL_DIR_, true, (int)$order->id_shop))
 						{
@@ -715,7 +715,7 @@ class AdminOrdersControllerCore extends AdminController
 								@Mail::Send(
 									(int)$order->id_lang,
 									'credit_slip',
-									Mail::l('New credit slip regarding your order', $order->id_lang),
+									Mail::l('New credit slip regarding your order', (int)$order->id_lang),
 									$params,
 									$customer->email,
 									$customer->firstname.' '.$customer->lastname,
@@ -1884,7 +1884,7 @@ class AdminOrdersControllerCore extends AdminController
 		Mail::Send(
 			(int)$order->id_lang,
 			'order_changed',
-			Mail::l('Your order has been changed', $order->id_lang),
+			Mail::l('Your order has been changed', (int)$order->id_lang),
 			$data,
 			$order->getCustomer()->email,
 			$order->getCustomer()->firstname.' '.$order->getCustomer()->lastname,
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index 4eb588566..b961e7f6c 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -129,9 +129,68 @@ class AdminPerformanceControllerCore extends AdminController
 		$this->fields_value['smarty_console_key'] = Configuration::get('PS_SMARTY_CONSOLE_KEY');
 	}
 
-	public function initFieldsetFeaturesDetachables()
+	public function initFieldsetDebugMode()
 	{
 		$this->fields_form[1]['form'] = array(
+			'legend' => array(
+				'title' => $this->l('Debug mode'),
+				'image' => '../img/admin/prefs.gif'
+			),
+			'input' => array(
+				array(
+					'type' => 'radio',
+					'label' => $this->l('Disable non PrestaShop modules'),
+					'name' => 'native_module',
+					'class' => 't',
+					'is_bool' => true,
+					'values' => array(
+						array(
+							'id' => 'native_module_on',
+							'value' => 1,
+							'label' => $this->l('Enabled')
+						),
+						array(
+							'id' => 'native_module_off',
+							'value' => 0,
+							'label' => $this->l('Disabled')
+						)
+					),
+					'desc' => $this->l('Enable or disable non PrestaShop Modules.')
+				),
+				array(
+					'type' => 'radio',
+					'label' => $this->l('Disable all overrides'),
+					'name' => 'overrides',
+					'class' => 't',
+					'is_bool' => true,
+					'values' => array(
+						array(
+							'id' => 'overrides_module_on',
+							'value' => 1,
+							'label' => $this->l('Enabled')
+						),
+						array(
+							'id' => 'overrides_module_off',
+							'value' => 0,
+							'label' => $this->l('Disabled')
+						)
+					),
+					'desc' => $this->l('Enable or disable all classes and controllers overrides')
+				),
+			),
+			'submit' => array(
+				'title' => $this->l('   Save   '),
+				'class' => 'button'
+			),
+		);
+
+		$this->fields_value['native_module'] = Configuration::get('PS_DISABLE_NON_NATIVE_MODULE');
+		$this->fields_value['overrides'] = Configuration::get('PS_DISABLE_OVERRIDES');
+	}
+
+	public function initFieldsetFeaturesDetachables()
+	{
+		$this->fields_form[2]['form'] = array(
 			'legend' => array(
 				'title' => $this->l('Optional features'),
 				'icon' => 'icon-puzzle-piece'
@@ -190,7 +249,7 @@ class AdminPerformanceControllerCore extends AdminController
 
 	public function initFieldsetCCC()
 	{
-		$this->fields_form[2]['form'] = array(
+		$this->fields_form[3]['form'] = array(
 			'legend' => array(
 				'title' => $this->l('CCC (Combine, Compress and Cache)'),
 				'icon' => 'icon-fullscreen'
@@ -300,7 +359,7 @@ class AdminPerformanceControllerCore extends AdminController
 
 	public function initFieldsetMediaServer()
 	{
-		$this->fields_form[3]['form'] = array(
+		$this->fields_form[4]['form'] = array(
 			'legend' => array(
 				'title' => $this->l('Media servers (use only with CCC)'),
 				'icon' => 'icon-link'
@@ -346,7 +405,8 @@ class AdminPerformanceControllerCore extends AdminController
 		$warning_mcrypt = str_replace('[a]', '<a href="http://www.php.net/manual/'.substr($php_lang, 0, 2).'/book.mcrypt.php" target="_blank">', $warning_mcrypt);
 		$warning_mcrypt = str_replace('[/a]', '</a>', $warning_mcrypt);
 	
-		$this->fields_form[4]['form'] = array(
+		$this->fields_form[5]['form'] = array(
+
 			'legend' => array(
 				'title' => $this->l('Ciphering'),
 				'icon' => 'icon-desktop'
@@ -399,7 +459,7 @@ class AdminPerformanceControllerCore extends AdminController
 
 		$warning_fs = ' '.sprintf($this->l('(the directory %s must be writable)'), realpath(_PS_CACHEFS_DIRECTORY_));
 
-		$this->fields_form[5]['form'] = array(
+		$this->fields_form[6]['form'] = array(
 			'legend' => array(
 				'title' => $this->l('Caching'),
 				'icon' => 'icon-desktop'
@@ -481,12 +541,19 @@ class AdminPerformanceControllerCore extends AdminController
 	{
 		// Initialize fieldset for a form
 		$this->initFieldsetSmarty();
+
+		if (_PS_MODE_DEV_)
+			$this->initFieldsetDebugMode();
+
 		$this->initFieldsetFeaturesDetachables();
 		$this->initFieldsetCCC();
 		$this->initFieldsetMediaServer();
 		$this->initFieldsetCiphering();
 		$this->initFieldsetCaching();
 
+		// Reindex fields
+		$this->fields_form = array_values($this->fields_form);
+
 		// Activate multiple fieldset
 		$this->multiple_fieldsets = true;
 
@@ -781,6 +848,17 @@ class AdminPerformanceControllerCore extends AdminController
 			Autoload::getInstance()->generateIndex();
 		}
 
+		if (Tools::isSubmit('submitAddconfiguration') && _PS_MODE_DEV_)
+		{
+			Configuration::updateGlobalValue('PS_DISABLE_NON_NATIVE_MODULE', (int)Tools::getValue('native_module'));
+			Configuration::updateGlobalValue('PS_DISABLE_OVERRIDES', (int)Tools::getValue('overrides'));
+
+			if (Tools::getValue('overrides'))
+				Autoload::getInstance()->_include_override_path = false;
+
+			Autoload::getInstance()->generateIndex();
+		}
+
 		if ($redirectAdmin && (!isset($this->errors) || !count($this->errors)))
 		{
 			Hook::exec('action'.get_class($this).ucfirst($this->action).'After', array('controller' => $this, 'return' => ''));
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index d1e758ddc..11765bdc9 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -180,7 +180,7 @@ class AdminProductsControllerCore extends AdminController
 				LEFT JOIN `'._DB_PREFIX_.'shop` shop ON (shop.id_shop = '.$id_shop.') 
 				LEFT JOIN `'._DB_PREFIX_.'image_shop` image_shop ON (image_shop.`id_image` = i.`id_image` AND image_shop.`cover` = 1 AND image_shop.id_shop = '.$id_shop.')';
 		
-		$this->_select .= 'shop.name as shopname, ';
+		$this->_select .= 'shop.name as shopname, a.id_shop_default, ';
 		$this->_select .= 'MAX('.$alias_image.'.id_image) id_image, cl.name `name_category`, '.$alias.'.`price`, 0 AS price_final, sav.`quantity` as sav_quantity, '.$alias.'.`active`';
 		
 		if ($join_category)
@@ -331,12 +331,17 @@ class AdminProductsControllerCore extends AdminController
 		$nb = count($this->_list);
 		if ($this->_list)
 		{
+			$context = $this->context->cloneContext();
+			$context->shop = clone($context->shop);
 			/* update product final price */
 			for ($i = 0; $i < $nb; $i++)
 			{
+				if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP)
+					$context->shop = new Shop((int)$this->_list[$i]['id_shop_default']);
+
 				// convert price with the currency from context
 				$this->_list[$i]['price'] = Tools::convertPrice($this->_list[$i]['price'], $this->context->currency, true, $this->context);
-				$this->_list[$i]['price_tmp'] = Product::getPriceStatic($this->_list[$i]['id_product'], true, null, 2, null, false, true, 1, true);
+				$this->_list[$i]['price_tmp'] = Product::getPriceStatic($this->_list[$i]['id_product'], true, null, 2, null, false, true, 1, true, null, null, null, $nothing, true, true, $context);
 			}
 		}
 
@@ -367,9 +372,9 @@ class AdminProductsControllerCore extends AdminController
 				{
 					if (is_array($default_product->$field_name))
 						foreach ($default_product->$field_name as $key => $value)
-							$this->object->{$field_name}[$key] = ObjectModel::formatValue($value, $def['fields'][$field_name]['type']);
+							$this->object->{$field_name}[$key] = $value;
 					else
-						$this->object->$field_name = ObjectModel::formatValue($default_product->$field_name, $def['fields'][$field_name]['type']);
+						$this->object->$field_name = $default_product->$field_name;
 				}
 			}
 			$this->object->loadStockData();
@@ -1337,7 +1342,6 @@ class AdminProductsControllerCore extends AdminController
 		if (isset($result['success']))
 		{
 			$obj = new Image((int)$result['success']['id_image']);
-
 			// Associate image to shop from context
 			$shops = Shop::getContextListShopID();
 			$obj->associateTo($shops);
@@ -1351,6 +1355,7 @@ class AdminProductsControllerCore extends AdminController
 				'id'=>$obj->id,
 				'path' => $obj->getExistingImgPath(),
 				'position' => $obj->position,
+				'legend' => $obj->legend,
 				'cover' => $obj->cover,
 				'shops' => $json_shops,
 			);
@@ -3676,6 +3681,7 @@ class AdminProductsControllerCore extends AdminController
 				foreach ($images as $k => $image)
 					$images[$k] = new Image($image['id_image']);
 
+
 				if ($this->context->shop->getContext() == Shop::CONTEXT_SHOP)
 					$current_shop_id = (int)$this->context->shop->id;
 				else
@@ -3694,8 +3700,16 @@ class AdminProductsControllerCore extends AdminController
 						'max_image_size' => $this->max_image_size / 1024 / 1024,
 						'up_filename' => (string)Tools::getValue('virtual_product_filename_attribute'),
 						'currency' => $this->context->currency,
-						'current_shop_id' => $current_shop_id
+						'current_shop_id' => $current_shop_id,
+						'languages' => $this->_languages,
+						'default_language' => (int)Configuration::get('PS_LANG_DEFAULT')
 				));
+
+				$type = ImageType::getByNameNType('%', 'products', 'height');
+				if (isset($type['name']))
+					$data->assign('imageType', $type['name']);
+				else
+					$data->assign('imageType', 'small_default');
 			}
 			else
 				$this->displayWarning($this->l('You must save the product in this shop before adding images.'));	
@@ -3752,7 +3766,11 @@ class AdminProductsControllerCore extends AdminController
 					$data->assign('available_date', ($this->getFieldValue($product, 'available_date') != 0) ? stripslashes(htmlentities($this->getFieldValue($product, 'available_date'), $this->context->language->id)) : '0000-00-00');
 
 					$i = 0;
-					$data->assign('imageType', ImageType::getByNameNType('small_default', 'products'));
+					$type = ImageType::getByNameNType('%', 'products', 'height');
+					if (isset($type['name']))
+						$data->assign('imageType', $type['name']);
+					else
+						$data->assign('imageType', 'small_default');
 					$data->assign('imageWidth', (isset($image_type['width']) ? (int)($image_type['width']) : 64) + 25);
 					foreach ($images as $k => $image)
 					{
diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php
index 14ecb53aa..17a6bc6dc 100644
--- a/controllers/admin/AdminSupplyOrdersController.php
+++ b/controllers/admin/AdminSupplyOrdersController.php
@@ -1410,7 +1410,9 @@ class AdminSupplyOrdersControllerCore extends AdminController
 										 		true,
 										 		$supply_order->id);
 
-					if (!$res)
+					if ($res)
+						StockAvailable::synchronize($supply_order_detail->id_product);
+					else
 						$this->errors[] = Tools::displayError($this->l('Something went wrong when adding products to the warehouse.'));
 
 					$location = Warehouse::getProductLocation($supply_order_detail->id_product,
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 5f1b6ebbe..ad12b52e6 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -1259,6 +1259,8 @@ class AdminTranslationsControllerCore extends AdminController
 		// Set the path of selected theme
 		if ($this->theme_selected)
 			define('_PS_THEME_SELECTED_DIR_', _PS_ROOT_DIR_.'/themes/'.$this->theme_selected.'/');
+		else
+			define('_PS_THEME_SELECTED_DIR_', '');
 
 		// Get type of translation
 		if (($type = Tools::getValue('type')) && !is_array($type))
diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php
index 6d6e449fa..5fbbd12ad 100644
--- a/controllers/front/AddressController.php
+++ b/controllers/front/AddressController.php
@@ -227,19 +227,19 @@ class AddressControllerCore extends FrontController
 			else // Update cart address
 				$this->context->cart->autosetProductAddress();
 
-            if ((bool)(Tools::getValue('select_address', false)) == true OR Tools::getValue('type') == 'invoice' && Configuration::get('PS_ORDER_PROCESS_TYPE'))
-            { 
-                $this->context->cart->id_address_invoice = (int)$address->id;
-                $this->context->cart->update();                
-            }
-            
+			if ((bool)(Tools::getValue('select_address', false)) == true OR (Tools::getValue('type') == 'invoice' && Configuration::get('PS_ORDER_PROCESS_TYPE')))
+				$this->context->cart->id_address_invoice = (int)$address->id;
+			elseif (Configuration::get('PS_ORDER_PROCESS_TYPE'))
+				$this->context->cart->id_address_invoice = (int)$this->context->cart->id_address_delivery;
+			$this->context->cart->update();
+
 			if ($this->ajax)
 			{
 				$return = array(
 					'hasError' => (bool)$this->errors,
 					'errors' => $this->errors,
-					'id_address_delivery' => $this->context->cart->id_address_delivery,
-					'id_address_invoice' => $this->context->cart->id_address_invoice
+					'id_address_delivery' => (int)$this->context->cart->id_address_delivery,
+					'id_address_invoice' => (int)$this->context->cart->id_address_invoice
 				);
 				die(Tools::jsonEncode($return));
 			}
@@ -247,6 +247,8 @@ class AddressControllerCore extends FrontController
 			// Redirect to old page or current page
 			if ($back = Tools::getValue('back'))
 			{
+				if ($back == Tools::secureReferrer(Tools::getValue('back')))
+					Tools::redirect(html_entity_decode($back));
 				$mod = Tools::getValue('mod');
 				Tools::redirect('index.php?controller='.$back.($mod ? '&back='.$mod : ''));
 			}
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 1f4520d46..0c664eaa5 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -94,7 +94,7 @@ class AuthControllerCore extends FrontController
 		if (!empty($key))
 			$back .= (strpos($back, '?') !== false ? '&' : '?').'key='.$key;
 		if (!empty($back))
-			$this->context->smarty->assign('back', Tools::safeOutput($back));
+			$this->context->smarty->assign('back', Tools::safeOutput(Tools::secureReferrer($back)));
 	
 		if (Tools::getValue('display_guest_checkout'))
 		{
@@ -329,7 +329,7 @@ class AuthControllerCore extends FrontController
 
 				if (!$this->ajax)
 				{
-					if ($back = Tools::getValue('back'))
+					if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back))
 						Tools::redirect(html_entity_decode($back));
 					Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account'));
 				}
@@ -394,7 +394,10 @@ class AuthControllerCore extends FrontController
 		$firstnameAddress = Tools::getValue('firstname');		
 		$_POST['lastname'] = Tools::getValue('customer_lastname');
 		$_POST['firstname'] = Tools::getValue('customer_firstname');
-		
+		$addresses_types = array('address');
+		if (!Configuration::get('PS_ORDER_PROCESS_TYPE') && Configuration::get('PS_GUEST_CHECKOUT_ENABLED') && Tools::getValue('invoice_address'))
+			$addresses_types[] = 'address_invoice';
+
 		$error_phone = false;
 		if (Configuration::get('PS_ONE_PHONE_AT_LEAST'))
 		{
@@ -404,10 +407,8 @@ class AuthControllerCore extends FrontController
 					$error_phone = true;
 			}
 			elseif (((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Configuration::get('PS_ORDER_PROCESS_TYPE')) 
-					|| (Configuration::get('PS_ORDER_PROCESS_TYPE') && !Tools::getValue('email_create')))
-					&& (!Tools::getValue('phone') && !Tools::getValue('phone_mobile')))
-				$error_phone = true;
-			elseif (((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Configuration::get('PS_ORDER_PROCESS_TYPE') && Tools::getValue('email_create')))
+					|| (Configuration::get('PS_ORDER_PROCESS_TYPE') && !Tools::getValue('email_create'))
+					|| (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Tools::getValue('email_create')))
 					&& (!Tools::getValue('phone') && !Tools::getValue('phone_mobile')))
 				$error_phone = true;
 		}
@@ -465,7 +466,7 @@ class AuthControllerCore extends FrontController
 							die(Tools::jsonEncode($return));
 						}
 
-						if ($back = Tools::getValue('back'))
+						if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back))
 							Tools::redirect(html_entity_decode($back));
 						// redirection: if cart is not empty : redirection to the cart
 						if (count($this->context->cart->getProducts(true)) > 0)
@@ -482,37 +483,57 @@ class AuthControllerCore extends FrontController
 		}
 		else // if registration type is in one step, we save the address
 		{
-			// Preparing address
-			$address = new Address();
 			$_POST['lastname'] = $lastnameAddress;
 			$_POST['firstname'] = $firstnameAddress;
-			$address->id_customer = 1;
-			$this->errors = array_unique(array_merge($this->errors, $address->validateController()));
-
-			// US customer: normalize the address
-			if ($address->id_country == Country::getByIso('US') && Configuration::get('PS_TAASC'))
+			$post_back = $_POST;
+			// Preparing addresses
+			foreach($addresses_types as $addresses_type)
 			{
-				include_once(_PS_TAASC_PATH_.'AddressStandardizationSolution.php');
-				$normalize = new AddressStandardizationSolution;
-				$address->address1 = $normalize->AddressLineStandardization($address->address1);
-				$address->address2 = $normalize->AddressLineStandardization($address->address2);
+				$$addresses_type = new Address();
+				$$addresses_type->id_customer = 1;
+
+				if ($addresses_type == 'address_invoice')
+					foreach($_POST as $key => &$post)
+						if (isset($_POST[$key.'_invoice']))
+							$post = $_POST[$key.'_invoice'];
+
+				$this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController()));
+				if ($addresses_type == 'address_invoice')
+					$_POST = $post_back;
+
+				// US customer: normalize the address
+				if ($$addresses_type->id_country == Country::getByIso('US') && Configuration::get('PS_TAASC'))
+				{
+					include_once(_PS_TAASC_PATH_.'AddressStandardizationSolution.php');
+					$normalize = new AddressStandardizationSolution;
+					$$addresses_type->address1 = $normalize->AddressLineStandardization($$addresses_type->address1);
+					$$addresses_type->address2 = $normalize->AddressLineStandardization($$addresses_type->address2);
+				}
+	
+				if (!($country = new Country($$addresses_type->id_country)) || !Validate::isLoadedObject($country))
+					$this->errors[] = Tools::displayError('Country cannot be loaded with address->id_country');
+				$postcode = Tools::getValue('postcode');		
+				/* Check zip code format */
+				if ($country->zip_code_format && !$country->checkZipCode($postcode))
+					$this->errors[] = sprintf(Tools::displayError('The Zip/Postal code you\'ve entered is invalid. It must follow this format: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format))));
+				elseif(empty($postcode) && $country->need_zip_code)
+					$this->errors[] = Tools::displayError('A Zip / Postal code is required.');
+				elseif ($postcode && !Validate::isPostCode($postcode))
+					$this->errors[] = Tools::displayError('The Zip / Postal code is invalid.');
+	
+				if ($country->need_identification_number && (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni'))))
+					$this->errors[] = Tools::displayError('The identification number is incorrect or has already been used.');
+				elseif (!$country->need_identification_number)
+					$$addresses_type->dni = null;
+
+				if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount'))
+					if (!($country = new Country($$addresses_type->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country))
+						$this->errors[] = Tools::displayError('Country is invalid');
+				$contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0;
+				$id_state = isset($$addresses_type) && is_object($$addresses_type) ? (int)$$addresses_type->id_state: 0;
+				if ((Tools::isSubmit('submitAccount')|| Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state)
+					$this->errors[] = Tools::displayError('This country requires you to choose a State.');
 			}
-
-			if (!($country = new Country($address->id_country)) || !Validate::isLoadedObject($country))
-				$this->errors[] = Tools::displayError('Country cannot be loaded with address->id_country');
-			$postcode = Tools::getValue('postcode');		
-			/* Check zip code format */
-			if ($country->zip_code_format && !$country->checkZipCode($postcode))
-				$this->errors[] = sprintf(Tools::displayError('The Zip/Postal code you\'ve entered is invalid. It must follow this format: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format))));
-			elseif(empty($postcode) && $country->need_zip_code)
-				$this->errors[] = Tools::displayError('A Zip / Postal code is required.');
-			elseif ($postcode && !Validate::isPostCode($postcode))
-				$this->errors[] = Tools::displayError('The Zip / Postal code is invalid.');
-
-			if ($country->need_identification_number && (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni'))))
-				$this->errors[] = Tools::displayError('The identification number is incorrect or has already been used.');
-			elseif (!$country->need_identification_number)
-				$address->dni = null;
 		}
 
 		if (!@checkdate(Tools::getValue('months'), Tools::getValue('days'), Tools::getValue('years')) && !(Tools::getValue('months') == '' && Tools::getValue('days') == '' && Tools::getValue('years') == ''))
@@ -531,88 +552,89 @@ class AuthControllerCore extends FrontController
 
 			if (!count($this->errors))
 			{
-				// if registration type is in one step, we save the address
-				if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount'))
-					if (!($country = new Country($address->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country))
-						die(Tools::displayError());
-				$contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0;
-				$id_state = isset($address) && is_object($address) ? (int)$address->id_state: 0;
-				if ((Tools::isSubmit('submitAccount')|| Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state)
-					$this->errors[] = Tools::displayError('This country requires you to choose a State.');
+				$customer->active = 1;
+				// New Guest customer
+				if (Tools::isSubmit('is_new_customer'))
+					$customer->is_guest = !Tools::getValue('is_new_customer', 1);
+				else
+					$customer->is_guest = 0;
+				if (!$customer->add())
+					$this->errors[] = Tools::displayError('An error occurred while creating your account.');
 				else
 				{
-					$customer->active = 1;
-					// New Guest customer
-					if (Tools::isSubmit('is_new_customer'))
-						$customer->is_guest = !Tools::getValue('is_new_customer', 1);
-					else
-						$customer->is_guest = 0;
-					if (!$customer->add())
-						$this->errors[] = Tools::displayError('An error occurred while creating your account.');
-					else
+					foreach($addresses_types as $addresses_type)
 					{
-						$address->id_customer = (int)$customer->id;
-						$this->errors = array_unique(array_merge($this->errors, $address->validateController()));
-						if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !$address->add())
+						$$addresses_type->id_customer = (int)$customer->id;				
+						if ($addresses_type == 'address_invoice')
+							foreach($_POST as $key => &$post)
+								if (isset($_POST[$key.'_invoice']))
+									$post = $_POST[$key.'_invoice'];
+		
+						$this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController()));
+						if ($addresses_type == 'address_invoice')
+							$_POST = $post_back;
+						if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !$$addresses_type->add())
 							$this->errors[] = Tools::displayError('An error occurred while creating your address.');
+					}
+					if (!count($this->errors))
+					{
+						if (!$customer->is_guest)
+						{
+							$this->context->customer = $customer;
+							$customer->cleanGroups();
+							// we add the guest customer in the default customer group
+							$customer->addGroups(array((int)Configuration::get('PS_CUSTOMER_GROUP')));
+							if (!$this->sendConfirmationMail($customer))
+								$this->errors[] = Tools::displayError('The email cannot be sent.');
+						}
 						else
 						{
-							if (!$customer->is_guest)
-							{
-								$this->context->customer = $customer;
-								$customer->cleanGroups();
-								// we add the guest customer in the default customer group
-								$customer->addGroups(array((int)Configuration::get('PS_CUSTOMER_GROUP')));
-								if (!$this->sendConfirmationMail($customer))
-									$this->errors[] = Tools::displayError('The email cannot be sent.');
-							}
-							else
-							{
-								$customer->cleanGroups();
-								// we add the guest customer in the guest customer group
-								$customer->addGroups(array((int)Configuration::get('PS_GUEST_GROUP')));
-							}
-							$this->updateContext($customer);
-							$this->context->cart->id_address_delivery = Address::getFirstCustomerAddressId((int)$customer->id);
-							$this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)$customer->id);
-
-							// If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated
-							$this->context->cart->update();
-
-							// Avoid articles without delivery address on the cart
-							$this->context->cart->autosetProductAddress();
-
-							Hook::exec('actionCustomerAccountAdd', array(
-									'_POST' => $_POST,
-									'newCustomer' => $customer
-								));
-							if ($this->ajax)
-							{
-								$return = array(
-									'hasError' => !empty($this->errors),
-									'errors' => $this->errors,
-									'isSaved' => true,
-									'id_customer' => (int)$this->context->cookie->id_customer,
-									'id_address_delivery' => $this->context->cart->id_address_delivery,
-									'id_address_invoice' => $this->context->cart->id_address_invoice,
-									'token' => Tools::getToken(false)
-								);
-								die(Tools::jsonEncode($return));
-							}
-							// if registration type is in two steps, we redirect to register address
-							if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount'))
-								Tools::redirect('index.php?controller=address');
-								
-							if ($back = Tools::getValue('back'))
-								Tools::redirect(html_entity_decode($back));
-
-							// redirection: if cart is not empty : redirection to the cart
-							if (count($this->context->cart->getProducts(true)) > 0)
-								Tools::redirect('index.php?controller=order&multi-shipping='.(int)Tools::getValue('multi-shipping'));
-							// else : redirection to the account
-							else
-								Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account'));
+							$customer->cleanGroups();
+							// we add the guest customer in the guest customer group
+							$customer->addGroups(array((int)Configuration::get('PS_GUEST_GROUP')));
 						}
+						$this->updateContext($customer);
+						$this->context->cart->id_address_delivery = (int)Address::getFirstCustomerAddressId((int)$customer->id);
+						$this->context->cart->id_address_invoice = (int)Address::getFirstCustomerAddressId((int)$customer->id);
+						if (isset($address_invoice) && Validate::isLoadedObject($address_invoice))
+							$this->context->cart->id_address_invoice = (int)$address_invoice->id;
+
+						// If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated
+						$this->context->cart->update();
+
+						// Avoid articles without delivery address on the cart
+						$this->context->cart->autosetProductAddress();
+
+						Hook::exec('actionCustomerAccountAdd', array(
+								'_POST' => $_POST,
+								'newCustomer' => $customer
+							));
+						if ($this->ajax)
+						{
+							$return = array(
+								'hasError' => !empty($this->errors),
+								'errors' => $this->errors,
+								'isSaved' => true,
+								'id_customer' => (int)$this->context->cookie->id_customer,
+								'id_address_delivery' => $this->context->cart->id_address_delivery,
+								'id_address_invoice' => $this->context->cart->id_address_invoice,
+								'token' => Tools::getToken(false)
+							);
+							die(Tools::jsonEncode($return));
+						}
+						// if registration type is in two steps, we redirect to register address
+						if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount'))
+							Tools::redirect('index.php?controller=address');
+							
+						if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back))
+							Tools::redirect(html_entity_decode($back));
+
+						// redirection: if cart is not empty : redirection to the cart
+						if (count($this->context->cart->getProducts(true)) > 0)
+							Tools::redirect('index.php?controller=order&multi-shipping='.(int)Tools::getValue('multi-shipping'));
+						// else : redirection to the account
+						else
+							Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account'));
 					}
 				}
 			}
diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php
index c5a282b00..a62047b02 100644
--- a/controllers/front/CmsController.php
+++ b/controllers/front/CmsController.php
@@ -110,6 +110,9 @@ class CmsControllerCore extends FrontController
 				'content_only' => (int)(Tools::getValue('content_only')),
 				'path' => $path
 			));
+
+			if ($this->cms->indexation == 0)
+				$this->context->smarty->assign('nobots', true);
 		}
 		else if ($this->assignCase == 2)
 		{
diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php
index 57b19b7a0..7634ecf9a 100644
--- a/controllers/front/OrderController.php
+++ b/controllers/front/OrderController.php
@@ -58,8 +58,8 @@ class OrderControllerCore extends ParentOrderController
 		{
 			$this->step = 0;
 			$this->errors[] = sprintf(
-				Tools::displayError('A minimum purchase total of %s is required in order to validate your order.'),
-				Tools::displayPrice($minimal_purchase, $currency)
+				Tools::displayError('A minimum purchase total of %1s (tax excl.) is required in order to validate your order, current purchase total is %2s (tax excl.).'),
+				Tools::displayPrice($minimal_purchase, $currency), Tools::displayPrice($this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS), $currency)
 			);
 		}
 		if (!$this->context->customer->isLogged(true) && in_array($this->step, array(1, 2, 3)))
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 7e9bc39ca..2b03955a6 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -445,6 +445,21 @@ class OrderOpcControllerCore extends ParentOrderController
 			'phone_mobile_invoice' => Tools::htmlentitiesUTF8($address_invoice->phone_mobile),
 			'id_country_invoice' => (int)($address_invoice->id_country),
 			'id_state_invoice' => (int)($address_invoice->id_state),
+			'id_address_invoice' => $id_address_invoice,
+			'invoice_company' => Tools::htmlentitiesUTF8($address_invoice->company),
+			'invoice_lastname' => Tools::htmlentitiesUTF8($address_invoice->lastname),
+			'invoice_firstname' => Tools::htmlentitiesUTF8($address_invoice->firstname),
+			'invoice_vat_number' => Tools::htmlentitiesUTF8($address_invoice->vat_number),
+			'invoice_dni' => Tools::htmlentitiesUTF8($address_invoice->dni),
+			'invoice_address' => $this->context->cart->id_address_invoice !== $this->context->cart->id_address_delivery,
+			'invoice_address1' => Tools::htmlentitiesUTF8($address_invoice->address1),
+			'invoice_address2' => Tools::htmlentitiesUTF8($address_invoice->address2),
+			'invoice_postcode' => Tools::htmlentitiesUTF8($address_invoice->postcode),
+			'invoice_city' => Tools::htmlentitiesUTF8($address_invoice->city),
+			'invoice_phone' => Tools::htmlentitiesUTF8($address_invoice->phone),
+			'invoice_phone_mobile' => Tools::htmlentitiesUTF8($address_invoice->phone_mobile),
+			'invoice_id_country' => (int)($address_invoice->id_country),
+			'invoice_id_state' => (int)($address_invoice->id_state),
 		);
 	}
 
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 097aa2f7d..6fa902bdc 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -149,7 +149,7 @@ class ParentOrderControllerCore extends FrontController
 		if ((Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 && Tools::getValue('step') == 1) || Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
 			$this->addJS(_THEME_JS_DIR_.'order-address.js');
 		$this->addJqueryPlugin('fancybox');
-		if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')) || Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
+		if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')) || Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 || Tools::getValue('step') == 2)
 		{
 			$this->addJqueryPlugin('typewatch');
 			$this->addJS(_THEME_JS_DIR_.'cart-summary.js');
@@ -465,7 +465,7 @@ class ParentOrderControllerCore extends FrontController
 		$address = new Address($this->context->cart->id_address_delivery);
 		$id_zone = Address::getZoneById($address->id);
 		$bad_delivery = false;
-		if ($bad_delivery = !Address::isCountryActiveById((int)$this->context->cart->id_address_delivery) || !Address::isCountryActiveById((int)$this->context->cart->id_address_invoice))
+		if (($bad_delivery = (bool)!Address::isCountryActiveById((int)$this->context->cart->id_address_delivery)) || (!Address::isCountryActiveById((int)$this->context->cart->id_address_invoice)))
 		{
 			if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 && Dispatcher::getInstance()->getController() != 'order-opc')
 				{
diff --git a/controllers/front/PdfInvoiceController.php b/controllers/front/PdfInvoiceController.php
index b02453342..a4d6b2429 100644
--- a/controllers/front/PdfInvoiceController.php
+++ b/controllers/front/PdfInvoiceController.php
@@ -63,23 +63,8 @@ class PdfInvoiceControllerCore extends FrontController
 		$order_invoice_list = $this->order->getInvoicesCollection();
 		Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => $order_invoice_list));
 
-		$pdf = new PDF($order_invoice_list, PDF::TEMPLATE_INVOICE, $this->context->smarty, $this->context->language->id);
+		$pdf = new PDF($order_invoice_list, PDF::TEMPLATE_INVOICE, $this->context->smarty);
 		$pdf->render();
 	}
 
-
-	/**
-	 * Returns the invoice template associated to the country iso_code
-	 * @param string $iso_user
-	 */
-	public function getTemplate($iso_country)
-	{
-		$template = _PS_THEME_PDF_DIR_.'/invoice.tpl';
-
-		$iso_template = _PS_THEME_PDF_DIR_.'/invoice.'.$iso_country.'.tpl';
-		if (file_exists($iso_template))
-			$template = $iso_template;
-
-		return $template;
-	}
-}
\ No newline at end of file
+}
diff --git a/docs/csv_import/alias_import.csv b/docs/csv_import/alias_import.csv
new file mode 100644
index 000000000..b64a435be
--- /dev/null
+++ b/docs/csv_import/alias_import.csv
@@ -0,0 +1,3 @@
+id;Alias *;Search *;Active (0/1)
+3;microsft,micro;microsoft;1
+4;adbe,adaub;adobe;1
diff --git a/docs/csv_import/customers_import.csv b/docs/csv_import/customers_import.csv
index bb119bcc0..8f839bc8e 100644
--- a/docs/csv_import/customers_import.csv
+++ b/docs/csv_import/customers_import.csv
@@ -1,3 +1,3 @@
-id;Active (0/1);Gender ID (Mr=1, Ms=2, else 9);E-mail*;Password*;Birthday;Lastname*;Firstname*;Newletter (0/1);Opt-in (0/1)
-1;1;1;johndoe@prestashop.com;#res152EDRF;1987-09-21;Doe;John;1;1
-2;1;2;mariedoe@prestashop.com;58@ret26#;1986-10-14;Doe;Marie;0;1
\ No newline at end of file
+id;Active (0/1);Gender ID (Mr=1, Ms=2, else 9);E-mail*;Password*;Birthday;Lastname*;Firstname*;Newletter (0/1);Opt-in (0/1);Groups (x,y,z...);Default group ID;ID / Name of shop
+1;1;1;johndoe@prestashop.com;#res152EDRF;1987-09-21;Doe;John;1;1;1,2;1;1
+2;1;2;mariedoe@prestashop.com;58@ret26#;1986-10-14;Doe;Marie;0;1;1,3;3;1
\ No newline at end of file
diff --git a/docs/csv_import/manufacturers_import.csv b/docs/csv_import/manufacturers_import.csv
index 6c8ea7cd0..2e4ef5d24 100644
--- a/docs/csv_import/manufacturers_import.csv
+++ b/docs/csv_import/manufacturers_import.csv
@@ -1,3 +1,3 @@
-id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description
-1;1;Apple Computer, Inc;;;;;
-2;1;Shure Incorporated;;;;;
\ No newline at end of file
+id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description;Image URL
+1;1;Apple Computer, Inc;;;;;http://youdomain.com/img.jpg
+2;1;Shure Incorporated;;;;;http://youdomain.com/img.jpg
diff --git a/docs/csv_import/products_import.csv b/docs/csv_import/products_import.csv
index 2475bab46..2952a2f05 100644
--- a/docs/csv_import/products_import.csv
+++ b/docs/csv_import/products_import.csv
@@ -1,3 +1,3 @@
 ID;Active (0/1);Name*;Categories (x,y,z,…);Price tax excl. Or Price tax excl;Tax rules id;Wholesale price;On sale (0/1);Discount amount;Discount percent;Discount from (yyy-mm-dd);Discount to (yyy-mm-dd);Reference #;Supplier reference #;Supplier;Manufacturer;EAN13;UPC;Ecotax;Width;Height;Depth;Weight;Quantity;Minimum quantity;Visibility;Additional shipping cost;Unity;Unity price ratio;Short description;Description;Tags (x,y,z,...);Meta-title;Meta-keywords;Meta-description;URL rewritten;Text when in-stock;Text if back-order allowed;Available for order (0 = No, 1 = Yes);Product available date;Product creation date;Show price (0 = No, 1 = Yes);Image URLs (x,y,z,...);Delete existing images (0 = No, 1 = Yes);Feature (Name:Value:Position);Available online only (0 = No, 1 = Yes);Condition (new,used,refurbished);Customizable;File fields;Text fields;Out of stock;Advanced stock management;ID / Name of shop
-1;1;iPod Nano;Home, iPods;49;1;40;0;;;;;92458844;54778855;AppleStore;Apple Computer, Inc;5605055055056;560505505555;0;0,1;0,2;0,3;0.5;800;1;both;0.00;;0.00;New design. New features. Now i….;Curved ahead of the curve. For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass de...;apple, ipod, nano;Meta title;Meta keywords;Meta description;ipod-nano;In stock;Out stock;1;;;1;http://youdomain.com/img.jpg, http://yourdomain.com/img1.jpg;0;Music:Rock:1;0;new;0;0;0;2;0;1
-2;1;iPod shuffle;Home, iPods;66.05;1;50;0;;;;;92458845;54778855;AppleStore;Apple Computer, Inc;5605055055057;560505505556;0;0,1;0,2;0,3;0.5;800;1;both;0.00;;0.00;iPod shuffle, the world’s most wearabl….;You want listen to music;ipod, shuffle;Meta title;Meta keywords;Meta description;ipod-shuffle;In stock;Out stock;1;;;1;http://youdomain.com/img25.jpg, http://yourdomain.com/img30.jpg;0;Music:Blues:2;0;new;0;0;0;2;0;1
+1;1;iPod Nano;Home, iPods;49;1;40;0;;;;;92458844;54778855;AppleStore;Apple Computer, Inc;5605055055056;560505505555;0;1;2;3;0.5;800;1;both;0.00;;0.00;New design. New features. Now i….;Curved ahead of the curve. For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass de...;apple, ipod, nano;Meta title;Meta keywords;Meta description;ipod-nano;In stock;Out stock;1;;;1;http://youdomain.com/img.jpg, http://yourdomain.com/img1.jpg;0;Music:Rock:1;0;new;0;0;0;2;0;1
+2;1;iPod shuffle;Home, iPods;66.05;1;50;0;;;;;92458845;54778855;AppleStore;Apple Computer, Inc;5605055055057;560505505556;0;1;2;3;0.5;800;1;both;0.00;;0.00;iPod shuffle, the world’s most wearabl….;You want listen to music;ipod, shuffle;Meta title;Meta keywords;Meta description;ipod-shuffle;In stock;Out stock;1;;;1;http://youdomain.com/img25.jpg, http://yourdomain.com/img30.jpg;0;Music:Blues:2;0;new;0;0;0;2;0;1
diff --git a/docs/csv_import/suppliers_import.csv b/docs/csv_import/suppliers_import.csv
index db319c908..c02561686 100644
--- a/docs/csv_import/suppliers_import.csv
+++ b/docs/csv_import/suppliers_import.csv
@@ -1,3 +1,3 @@
-id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description
-1;1;Applestore;;;;;
-2;1;Shure Online Store;;;;;
\ No newline at end of file
+id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description;Image URL
+1;1;Applestore;;;;;http://youdomain.com/img.jpg
+2;1;Shure Online Store;;;;;http://youdomain.com/img.jpg
diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php
index 7cef69f5f..8a83a4526 100644
--- a/install-dev/classes/controllerHttp.php
+++ b/install-dev/classes/controllerHttp.php
@@ -95,6 +95,10 @@ abstract class InstallControllerHttp
 
 	final public static function execute()
 	{
+		$session = InstallSession::getInstance();
+		if (!$session->last_step || $session->last_step == 'welcome')
+			Autoload::getInstance()->generateIndex();
+
 		if (Tools::getValue('compile_templates'))
 		{
 			require_once (_PS_INSTALL_CONTROLLERS_PATH_.'http/smarty_compile.php');
@@ -111,7 +115,6 @@ abstract class InstallControllerHttp
 			self::$instances[$step] = new $classname($step);
 		}
 
-		$session = InstallSession::getInstance();
 		if (!$session->last_step || !in_array($session->last_step, self::$steps))
 			$session->last_step = self::$steps[0];
 
diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php
index 8ab8b0286..49aaf5a3e 100644
--- a/install-dev/controllers/http/process.php
+++ b/install-dev/controllers/http/process.php
@@ -358,7 +358,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 				$install_modules['subtasks'][] = array('module' => $module);
 		$this->process_steps[] = $install_modules;
 		
-		$install_modules = array('key' => 'installModulesAddons', 'lang' => $this->l('Install modules Addons'));
+		$install_modules = array('key' => 'installModulesAddons', 'lang' => $this->l('Install Addons modules'));
 
 		$params = array('iso_lang' => $this->language->getLanguageIso(), 
 							'iso_country' => $this->session->shop_country, 
diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql
index 2908ca542..ef426e1ac 100644
--- a/install-dev/data/db_structure.sql
+++ b/install-dev/data/db_structure.sql
@@ -365,6 +365,7 @@ CREATE TABLE `PREFIX_cms` (
   `id_cms_category` int(10) unsigned NOT NULL,
   `position` int(10) unsigned NOT NULL DEFAULT '0',
   `active` tinyint(1) unsigned NOT NULL default '0',
+  `indexation` tinyint(1) unsigned NOT NULL default '1',
   PRIMARY KEY (`id_cms`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
diff --git a/install-dev/data/xml/address_format.xml b/install-dev/data/xml/address_format.xml
index fd195888b..68c7ed274 100644
--- a/install-dev/data/xml/address_format.xml
+++ b/install-dev/data/xml/address_format.xml
@@ -13,7 +13,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_2" id_country="AT">
       <format>firstname lastname
@@ -23,7 +24,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_3" id_country="BE">
       <format>firstname lastname
@@ -33,7 +35,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_4" id_country="CA">
       <format>firstname lastname
@@ -42,7 +45,8 @@ address1
 address2
 city State:name postcode
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_5" id_country="CN">
       <format>firstname lastname
@@ -52,7 +56,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_6" id_country="ES">
       <format>firstname lastname
@@ -62,7 +67,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_7" id_country="FI">
       <format>firstname lastname
@@ -72,7 +78,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_8" id_country="FR">
       <format>firstname lastname
@@ -82,7 +89,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_9" id_country="GR">
       <format>firstname lastname
@@ -92,7 +100,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_10" id_country="IT">
       <format>firstname lastname
@@ -103,7 +112,8 @@ address2
 postcode city
 State:name
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_11" id_country="JP">
       <format>firstname lastname
@@ -114,7 +124,8 @@ address2
 postcode city
 State:name
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_12" id_country="LU">
       <format>firstname lastname
@@ -124,7 +135,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_13" id_country="NL">
       <format>firstname lastname
@@ -134,7 +146,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_14" id_country="PL">
       <format>firstname lastname
@@ -144,7 +157,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_15" id_country="PT">
       <format>firstname lastname
@@ -154,7 +168,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_16" id_country="CZ">
       <format>firstname lastname
@@ -164,7 +179,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_17" id_country="GB">
       <format>firstname lastname
@@ -174,7 +190,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_18" id_country="SE">
       <format>firstname lastname
@@ -184,7 +201,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_19" id_country="CH">
       <format>firstname lastname
@@ -194,7 +212,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_20" id_country="DK">
       <format>firstname lastname
@@ -204,7 +223,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_21" id_country="US">
       <format>firstname lastname
@@ -212,7 +232,8 @@ company
 address1 address2
 city, State:name postcode
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_22" id_country="HK">
       <format>firstname lastname
@@ -222,7 +243,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_23" id_country="NO">
       <format>firstname lastname
@@ -232,7 +254,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_24" id_country="AU">
       <format>firstname lastname
@@ -242,7 +265,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_25" id_country="SG">
       <format>firstname lastname
@@ -252,7 +276,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_26" id_country="IE">
       <format>firstname lastname
@@ -262,7 +287,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_27" id_country="NZ">
       <format>firstname lastname
@@ -272,7 +298,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_28" id_country="KR">
       <format>firstname lastname
@@ -282,7 +309,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_29" id_country="IL">
       <format>firstname lastname
@@ -292,7 +320,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_30" id_country="ZA">
       <format>firstname lastname
@@ -302,7 +331,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_31" id_country="NG">
       <format>firstname lastname
@@ -312,7 +342,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_32" id_country="CI">
       <format>firstname lastname
@@ -322,7 +353,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_33" id_country="TG">
       <format>firstname lastname
@@ -332,7 +364,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_34" id_country="BO">
       <format>firstname lastname
@@ -342,7 +375,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_35" id_country="MU">
       <format>firstname lastname
@@ -352,7 +386,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_36" id_country="RO">
       <format>firstname lastname
@@ -362,7 +397,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_37" id_country="SK">
       <format>firstname lastname
@@ -372,7 +408,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_38" id_country="DZ">
       <format>firstname lastname
@@ -382,7 +419,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_39" id_country="AS">
       <format>firstname lastname
@@ -392,7 +430,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_40" id_country="AD">
       <format>firstname lastname
@@ -402,7 +441,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_41" id_country="AO">
       <format>firstname lastname
@@ -412,7 +452,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_42" id_country="AI">
       <format>firstname lastname
@@ -422,7 +463,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_43" id_country="AG">
       <format>firstname lastname
@@ -432,7 +474,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_44" id_country="AR">
       <format>firstname lastname
@@ -443,7 +486,8 @@ address2
 postcode city
 State:name
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_45" id_country="AM">
       <format>firstname lastname
@@ -453,7 +497,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_46" id_country="AW">
       <format>firstname lastname
@@ -463,7 +508,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_47" id_country="AZ">
       <format>firstname lastname
@@ -473,7 +519,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_48" id_country="BS">
       <format>firstname lastname
@@ -483,7 +530,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_49" id_country="BH">
       <format>firstname lastname
@@ -493,7 +541,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_50" id_country="BD">
       <format>firstname lastname
@@ -503,7 +552,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_51" id_country="BB">
       <format>firstname lastname
@@ -513,7 +563,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_52" id_country="BY">
       <format>firstname lastname
@@ -523,7 +574,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_53" id_country="BZ">
       <format>firstname lastname
@@ -533,7 +585,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_54" id_country="BJ">
       <format>firstname lastname
@@ -543,7 +596,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_55" id_country="BM">
       <format>firstname lastname
@@ -553,7 +607,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_56" id_country="BT">
       <format>firstname lastname
@@ -563,7 +618,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_57" id_country="BW">
       <format>firstname lastname
@@ -573,7 +629,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_58" id_country="BR">
       <format>firstname lastname
@@ -583,7 +640,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_59" id_country="BN">
       <format>firstname lastname
@@ -593,7 +651,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_60" id_country="BF">
       <format>firstname lastname
@@ -603,7 +662,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_61" id_country="MM">
       <format>firstname lastname
@@ -613,7 +673,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_62" id_country="BI">
       <format>firstname lastname
@@ -623,7 +684,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_63" id_country="KH">
       <format>firstname lastname
@@ -633,7 +695,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_64" id_country="CM">
       <format>firstname lastname
@@ -643,7 +706,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_65" id_country="CV">
       <format>firstname lastname
@@ -653,7 +717,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_66" id_country="CF">
       <format>firstname lastname
@@ -663,7 +728,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_67" id_country="TD">
       <format>firstname lastname
@@ -673,7 +739,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_68" id_country="CL">
       <format>firstname lastname
@@ -683,7 +750,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_69" id_country="CO">
       <format>firstname lastname
@@ -693,7 +761,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_70" id_country="KM">
       <format>firstname lastname
@@ -703,7 +772,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_71" id_country="CD">
       <format>firstname lastname
@@ -713,7 +783,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_72" id_country="CG">
       <format>firstname lastname
@@ -723,7 +794,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_73" id_country="CR">
       <format>firstname lastname
@@ -733,7 +805,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_74" id_country="HR">
       <format>firstname lastname
@@ -743,7 +816,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_75" id_country="CU">
       <format>firstname lastname
@@ -753,7 +827,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_76" id_country="CY">
       <format>firstname lastname
@@ -763,7 +838,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_77" id_country="DJ">
       <format>firstname lastname
@@ -773,7 +849,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_78" id_country="DM">
       <format>firstname lastname
@@ -783,7 +860,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_79" id_country="DO">
       <format>firstname lastname
@@ -793,7 +871,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_80" id_country="TL">
       <format>firstname lastname
@@ -803,7 +882,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_81" id_country="EC">
       <format>firstname lastname
@@ -813,7 +893,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_82" id_country="EG">
       <format>firstname lastname
@@ -823,7 +904,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_83" id_country="SV">
       <format>firstname lastname
@@ -833,7 +915,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_84" id_country="GQ">
       <format>firstname lastname
@@ -843,7 +926,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_85" id_country="ER">
       <format>firstname lastname
@@ -853,7 +937,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_86" id_country="EE">
       <format>firstname lastname
@@ -863,7 +948,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_87" id_country="ET">
       <format>firstname lastname
@@ -873,7 +959,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_88" id_country="FK">
       <format>firstname lastname
@@ -883,7 +970,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_89" id_country="FO">
       <format>firstname lastname
@@ -893,7 +981,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_90" id_country="FJ">
       <format>firstname lastname
@@ -903,7 +992,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_91" id_country="GA">
       <format>firstname lastname
@@ -913,7 +1003,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_92" id_country="GM">
       <format>firstname lastname
@@ -923,7 +1014,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_93" id_country="GE">
       <format>firstname lastname
@@ -933,7 +1025,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_94" id_country="GH">
       <format>firstname lastname
@@ -943,7 +1036,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_95" id_country="GD">
       <format>firstname lastname
@@ -953,7 +1047,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_96" id_country="GL">
       <format>firstname lastname
@@ -963,7 +1058,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_97" id_country="GI">
       <format>firstname lastname
@@ -973,7 +1069,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_98" id_country="GP">
       <format>firstname lastname
@@ -983,7 +1080,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_99" id_country="GU">
       <format>firstname lastname
@@ -993,7 +1091,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_100" id_country="GT">
       <format>firstname lastname
@@ -1003,7 +1102,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_101" id_country="GG">
       <format>firstname lastname
@@ -1013,7 +1113,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_102" id_country="GN">
       <format>firstname lastname
@@ -1023,7 +1124,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_103" id_country="GW">
       <format>firstname lastname
@@ -1033,7 +1135,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_104" id_country="GY">
       <format>firstname lastname
@@ -1043,7 +1146,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_105" id_country="HT">
       <format>firstname lastname
@@ -1053,7 +1157,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_106" id_country="HM">
       <format>firstname lastname
@@ -1063,7 +1168,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_107" id_country="VA">
       <format>firstname lastname
@@ -1073,7 +1179,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_108" id_country="HN">
       <format>firstname lastname
@@ -1083,7 +1190,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_109" id_country="IS">
       <format>firstname lastname
@@ -1093,7 +1201,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_110" id_country="IN">
       <format>firstname lastname
@@ -1103,7 +1212,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_111" id_country="ID">
       <format>firstname lastname
@@ -1114,7 +1224,8 @@ address2
 postcode city
 State:name
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_112" id_country="IR">
       <format>firstname lastname
@@ -1124,7 +1235,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_113" id_country="IQ">
       <format>firstname lastname
@@ -1134,7 +1246,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_114" id_country="IM">
       <format>firstname lastname
@@ -1144,7 +1257,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_115" id_country="JM">
       <format>firstname lastname
@@ -1154,7 +1268,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_116" id_country="JE">
       <format>firstname lastname
@@ -1164,7 +1279,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_117" id_country="JO">
       <format>firstname lastname
@@ -1174,7 +1290,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_118" id_country="KZ">
       <format>firstname lastname
@@ -1184,7 +1301,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_119" id_country="KE">
       <format>firstname lastname
@@ -1194,7 +1312,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_120" id_country="KI">
       <format>firstname lastname
@@ -1204,7 +1323,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_121" id_country="KP">
       <format>firstname lastname
@@ -1214,7 +1334,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_122" id_country="KW">
       <format>firstname lastname
@@ -1224,7 +1345,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_123" id_country="KG">
       <format>firstname lastname
@@ -1234,7 +1356,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_124" id_country="LA">
       <format>firstname lastname
@@ -1244,7 +1367,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_125" id_country="LV">
       <format>firstname lastname
@@ -1254,7 +1378,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_126" id_country="LB">
       <format>firstname lastname
@@ -1264,7 +1389,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_127" id_country="LS">
       <format>firstname lastname
@@ -1274,7 +1400,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_128" id_country="LR">
       <format>firstname lastname
@@ -1284,7 +1411,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_129" id_country="LY">
       <format>firstname lastname
@@ -1294,7 +1422,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_130" id_country="LI">
       <format>firstname lastname
@@ -1304,7 +1433,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_131" id_country="LT">
       <format>firstname lastname
@@ -1314,7 +1444,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_132" id_country="MO">
       <format>firstname lastname
@@ -1324,7 +1455,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_133" id_country="MK">
       <format>firstname lastname
@@ -1334,7 +1466,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_134" id_country="MG">
       <format>firstname lastname
@@ -1344,7 +1477,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_135" id_country="MW">
       <format>firstname lastname
@@ -1354,7 +1488,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_136" id_country="MY">
       <format>firstname lastname
@@ -1364,7 +1499,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_137" id_country="MV">
       <format>firstname lastname
@@ -1374,7 +1510,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_138" id_country="ML">
       <format>firstname lastname
@@ -1384,7 +1521,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_139" id_country="MT">
       <format>firstname lastname
@@ -1394,7 +1532,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_140" id_country="MH">
       <format>firstname lastname
@@ -1404,7 +1543,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_141" id_country="MQ">
       <format>firstname lastname
@@ -1414,7 +1554,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_142" id_country="MR">
       <format>firstname lastname
@@ -1424,7 +1565,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_143" id_country="HU">
       <format>firstname lastname
@@ -1434,7 +1576,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_144" id_country="YT">
       <format>firstname lastname
@@ -1444,7 +1587,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_145" id_country="MX">
       <format>firstname lastname
@@ -1455,7 +1599,8 @@ address2
 postcode city
 State:name
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_146" id_country="FM">
       <format>firstname lastname
@@ -1465,7 +1610,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_147" id_country="MD">
       <format>firstname lastname
@@ -1475,7 +1621,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_148" id_country="MC">
       <format>firstname lastname
@@ -1485,7 +1632,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_149" id_country="MN">
       <format>firstname lastname
@@ -1495,7 +1643,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_150" id_country="ME">
       <format>firstname lastname
@@ -1505,7 +1654,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_151" id_country="MS">
       <format>firstname lastname
@@ -1515,7 +1665,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_152" id_country="MA">
       <format>firstname lastname
@@ -1525,7 +1676,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_153" id_country="MZ">
       <format>firstname lastname
@@ -1535,7 +1687,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_154" id_country="NA">
       <format>firstname lastname
@@ -1545,7 +1698,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_155" id_country="NR">
       <format>firstname lastname
@@ -1555,7 +1709,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_156" id_country="NP">
       <format>firstname lastname
@@ -1565,7 +1720,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_157" id_country="AN">
       <format>firstname lastname
@@ -1575,7 +1731,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_158" id_country="NC">
       <format>firstname lastname
@@ -1585,7 +1742,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_159" id_country="NI">
       <format>firstname lastname
@@ -1595,7 +1753,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_160" id_country="NE">
       <format>firstname lastname
@@ -1605,7 +1764,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_161" id_country="NU">
       <format>firstname lastname
@@ -1615,7 +1775,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_162" id_country="NF">
       <format>firstname lastname
@@ -1625,7 +1786,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_163" id_country="MP">
       <format>firstname lastname
@@ -1635,7 +1797,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_164" id_country="OM">
       <format>firstname lastname
@@ -1645,7 +1808,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_165" id_country="PK">
       <format>firstname lastname
@@ -1655,7 +1819,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_166" id_country="PW">
       <format>firstname lastname
@@ -1665,7 +1830,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_167" id_country="PS">
       <format>firstname lastname
@@ -1675,7 +1841,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_168" id_country="PA">
       <format>firstname lastname
@@ -1685,7 +1852,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_169" id_country="PG">
       <format>firstname lastname
@@ -1695,7 +1863,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_170" id_country="PY">
       <format>firstname lastname
@@ -1705,7 +1874,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_171" id_country="PE">
       <format>firstname lastname
@@ -1715,7 +1885,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_172" id_country="PH">
       <format>firstname lastname
@@ -1725,7 +1896,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_173" id_country="PN">
       <format>firstname lastname
@@ -1735,7 +1907,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_174" id_country="PR">
       <format>firstname lastname
@@ -1745,7 +1918,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_175" id_country="QA">
       <format>firstname lastname
@@ -1755,7 +1929,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_176" id_country="RE">
       <format>firstname lastname
@@ -1765,7 +1940,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_177" id_country="RU">
       <format>firstname lastname
@@ -1775,7 +1951,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_178" id_country="RW">
       <format>firstname lastname
@@ -1785,7 +1962,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_179" id_country="BL">
       <format>firstname lastname
@@ -1795,7 +1973,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_180" id_country="KN">
       <format>firstname lastname
@@ -1805,7 +1984,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_181" id_country="LC">
       <format>firstname lastname
@@ -1815,7 +1995,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_182" id_country="MF">
       <format>firstname lastname
@@ -1825,7 +2006,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_183" id_country="PM">
       <format>firstname lastname
@@ -1835,7 +2017,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_184" id_country="VC">
       <format>firstname lastname
@@ -1845,7 +2028,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_185" id_country="WS">
       <format>firstname lastname
@@ -1855,7 +2039,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_186" id_country="SM">
       <format>firstname lastname
@@ -1865,7 +2050,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_187" id_country="ST">
       <format>firstname lastname
@@ -1875,7 +2061,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_188" id_country="SA">
       <format>firstname lastname
@@ -1885,7 +2072,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_189" id_country="SN">
       <format>firstname lastname
@@ -1895,7 +2083,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_190" id_country="RS">
       <format>firstname lastname
@@ -1905,7 +2094,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_191" id_country="SC">
       <format>firstname lastname
@@ -1915,7 +2105,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_192" id_country="SL">
       <format>firstname lastname
@@ -1925,7 +2116,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_193" id_country="SI">
       <format>firstname lastname
@@ -1935,7 +2127,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_194" id_country="SB">
       <format>firstname lastname
@@ -1945,7 +2138,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_195" id_country="SO">
       <format>firstname lastname
@@ -1955,7 +2149,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_196" id_country="GS">
       <format>firstname lastname
@@ -1965,7 +2160,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_197" id_country="LK">
       <format>firstname lastname
@@ -1975,7 +2171,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_198" id_country="SD">
       <format>firstname lastname
@@ -1985,7 +2182,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_199" id_country="SR">
       <format>firstname lastname
@@ -1995,7 +2193,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_200" id_country="SJ">
       <format>firstname lastname
@@ -2005,7 +2204,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_201" id_country="SZ">
       <format>firstname lastname
@@ -2015,7 +2215,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_202" id_country="SY">
       <format>firstname lastname
@@ -2025,7 +2226,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_203" id_country="TW">
       <format>firstname lastname
@@ -2035,7 +2237,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_204" id_country="TJ">
       <format>firstname lastname
@@ -2045,7 +2248,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_205" id_country="TZ">
       <format>firstname lastname
@@ -2055,7 +2259,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_206" id_country="TH">
       <format>firstname lastname
@@ -2065,7 +2270,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_207" id_country="TK">
       <format>firstname lastname
@@ -2075,7 +2281,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_208" id_country="TO">
       <format>firstname lastname
@@ -2085,7 +2292,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_209" id_country="TT">
       <format>firstname lastname
@@ -2095,7 +2303,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_210" id_country="TN">
       <format>firstname lastname
@@ -2105,7 +2314,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_211" id_country="TR">
       <format>firstname lastname
@@ -2115,7 +2325,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_212" id_country="TM">
       <format>firstname lastname
@@ -2125,7 +2336,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_213" id_country="TC">
       <format>firstname lastname
@@ -2135,7 +2347,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_214" id_country="TV">
       <format>firstname lastname
@@ -2145,7 +2358,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_215" id_country="UG">
       <format>firstname lastname
@@ -2155,7 +2369,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_216" id_country="UA">
       <format>firstname lastname
@@ -2165,7 +2380,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_217" id_country="AE">
       <format>firstname lastname
@@ -2175,7 +2391,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_218" id_country="UY">
       <format>firstname lastname
@@ -2185,7 +2402,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_219" id_country="UZ">
       <format>firstname lastname
@@ -2195,7 +2413,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_220" id_country="VU">
       <format>firstname lastname
@@ -2205,7 +2424,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_221" id_country="VE">
       <format>firstname lastname
@@ -2215,7 +2435,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_222" id_country="VN">
       <format>firstname lastname
@@ -2225,7 +2446,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_223" id_country="VG">
       <format>firstname lastname
@@ -2235,7 +2457,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_224" id_country="VI">
       <format>firstname lastname
@@ -2245,7 +2468,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_225" id_country="WF">
       <format>firstname lastname
@@ -2255,7 +2479,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_226" id_country="EH">
       <format>firstname lastname
@@ -2265,7 +2490,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_227" id_country="YE">
       <format>firstname lastname
@@ -2275,7 +2501,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_228" id_country="ZM">
       <format>firstname lastname
@@ -2285,7 +2512,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_229" id_country="ZW">
       <format>firstname lastname
@@ -2295,7 +2523,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_230" id_country="AL">
       <format>firstname lastname
@@ -2305,7 +2534,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_231" id_country="AF">
       <format>firstname lastname
@@ -2315,7 +2545,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_232" id_country="AQ">
       <format>firstname lastname
@@ -2325,7 +2556,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_233" id_country="BA">
       <format>firstname lastname
@@ -2335,7 +2567,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_234" id_country="BV">
       <format>firstname lastname
@@ -2345,7 +2578,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_235" id_country="IO">
       <format>firstname lastname
@@ -2355,7 +2589,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_236" id_country="BG">
       <format>firstname lastname
@@ -2365,7 +2600,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_237" id_country="KY">
       <format>firstname lastname
@@ -2375,7 +2611,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_238" id_country="CX">
       <format>firstname lastname
@@ -2385,7 +2622,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_239" id_country="CC">
       <format>firstname lastname
@@ -2395,7 +2633,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_240" id_country="CK">
       <format>firstname lastname
@@ -2405,7 +2644,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_241" id_country="GF">
       <format>firstname lastname
@@ -2415,7 +2655,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_242" id_country="PF">
       <format>firstname lastname
@@ -2425,7 +2666,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_243" id_country="TF">
       <format>firstname lastname
@@ -2435,7 +2677,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
     <address_format id="address_format_244" id_country="AX">
       <format>firstname lastname
@@ -2445,7 +2688,8 @@ address1
 address2
 postcode city
 Country:name
-phone</format>
+phone
+phone_mobile</format>
     </address_format>
   </entities>
 </entity_address_format>
diff --git a/install-dev/dev/translate.php b/install-dev/dev/translate.php
index fb92d7e66..31c0f0540 100644
--- a/install-dev/dev/translate.php
+++ b/install-dev/dev/translate.php
@@ -66,7 +66,7 @@ echo '
 	<body>
 		<form action="translate.php" method="post">
 			<select name="iso" onchange="document.location = \'translate.php?iso=\'+this.value;">
-				<option>-- Choose your language --</option>';
+				<option>- Choose your language -</option>';
 foreach ($languages as $language)
 	if (file_exists('../langs/'.$language.'/install.php'))
 		echo '<option value="'.htmlspecialchars($language, ENT_COMPAT, 'utf-8').'" '.($iso == $language ? 'selected="selected"' : '').'>'.htmlspecialchars($language, ENT_NOQUOTES, 'utf-8').'</option>'."\n";
diff --git a/install-dev/init.php b/install-dev/init.php
index 32a325c7c..807365fcb 100644
--- a/install-dev/init.php
+++ b/install-dev/init.php
@@ -27,7 +27,7 @@
 ob_start();
 
 // Check PHP version
-if (version_compare(PHP_VERSION, '5.1.3', '<'))
+if (version_compare(preg_replace('/[^0-9.]/', '', PHP_VERSION), '5.1.3', '<'))
 	die('You need at least PHP 5.1.3 to run PrestaShop. Your current PHP version is '.PHP_VERSION);
 
 // Generate common constants
diff --git a/install-dev/langs/bn/install.php b/install-dev/langs/bn/install.php
index a2fe3ecad..e588eaa4f 100644
--- a/install-dev/langs/bn/install.php
+++ b/install-dev/langs/bn/install.php
@@ -62,9 +62,9 @@ return array(
 		'Populate database tables' => 'ডাটাবেস টেবিল তথ্যপূর্ণ হয়েছে',
 		'Configure shop information' => 'দোকানের তথ্য কনফিগার হয়েছে',
 		'Install modules' => 'মডিউল ইনস্টল হয়েছে',
-		'Install modules Addons' => 'মডিউল অ্যাডঅনস ইনস্টল হয়েছে',
+		'Install Addons modules' => 'মডিউল অ্যাডঅনস ইনস্টল হয়েছে',
 		'Install demonstration data' => 'ডেমনেসট্রেসন তথ্য ইনস্টল হয়েছে',
-		'PHP parameters:' => 'পিএইচপি পরামিতি:',
+		'PHP parameters:' => 'পিএইচপি পরামিতি',
 		'PHP 5.1.2 or later is not enabled' => 'পিএইচপি 5.1.2 অথবা পরবর্তী সংস্করণ সক্রিয় করা নেই',
 		'Cannot upload files' => 'ফাইল আপলোড করা যাচ্ছে না',
 		'Cannot create new files and folders' => 'নতুন ফাইল এবং ফোল্ডার তৈরি করা যাচ্ছে না',
@@ -106,52 +106,52 @@ return array(
 		'Fixtures class "%s" not found' => '"%s" Fixtures class পাওয়া যায় নি',
 		'"%s" must be an instane of "InstallXmlLoader"' => '"%s" কে অবশ্যই  "InstallXmlLoader" এর একটি instaneহতে হবে',
 		'Information about your Store' => 'আপনার দোকান সম্পর্কে তথ্য',
-		'Shop name:' => 'দোকানের নাম:',
-		'Main activity:' => 'মুখ্য কার্যকলাপ:',
+		'Shop name' => 'দোকানের নাম',
+		'Main activity' => 'মুখ্য কার্যকলাপ',
 		'Please choose your main activity' => 'আপনার প্রধান কার্যকলাপ বেছে নিন',
 		'Other activity...' => 'অন্য কার্যকলাপ ...',
 		'Help us learn more about your store so we can offer you optimal guidance and the best features for your business!' => 'আমরা যাতে আপনাকে আপনার ব্যবসার জন্য অনুকূল নির্দেশিকা এবং সর্বোত্তম বৈশিষ্ট্য অফার করতে পারি সেজন্য আমাদের আপনার দোকান সম্বন্ধে আরও জানতে সাহায্য করুন!',
-		'Install demo products:' => 'ডেমো পণ্য ইনস্টল করুন:',
+		'Install demo products' => 'ডেমো পণ্য ইনস্টল করুন',
 		'Yes' => 'হ্যাঁ',
 		'No' => 'না ',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'ডেমো পণ্য PrestaShopএর ব্যবহার শিখার একটি ভালো উপায়।আপনি যদি এটার সাথে পরিচিত না হন, তাহলে তাদের ইনস্টল করা উচিত।',
-		'Country:' => 'দেশ:',
+		'Country' => 'দেশ',
 		'Select your country' => 'আপনার দেশ নির্বাচন করুন',
-		'Shop timezone:' => 'দোকানের সময় অঞ্চল(timezone):',
+		'Shop timezone:' => 'দোকানের সময় অঞ্চল(timezone)',
 		'Select your timezone' => 'আপনার সময় অঞ্চল নির্বাচন করুন',
-		'Shop logo:' => 'দোকান লোগো:',
+		'Shop logo:' => 'দোকান লোগো',
 		'Optional - You can add you logo at a later time.' => 'ঐচ্ছিক - পরবর্তী সময়ে লোগো যোগ করতে পারেন.',
 		'Your Account' => 'আপনার অ্যাকাউন্ট',
-		'First name:' => 'নামের ১ম অংশঃ',
-		'Last name:' => 'নামের শেষ অংশঃ',
-		'E-mail address:' => 'ইমেইল ঠিকানা:',
+		'First name' => 'নামের ১ম অংশঃ',
+		'Last name' => 'নামের শেষ অংশঃ',
+		'E-mail address' => 'ইমেইল ঠিকানা',
 		'This email address will be your username to access your store\'s back office.' => 'এই ইমেইল ঠিকানা আপনার দোকান এর ব্যাক অফিস অ্যাক্সেস করতে আপনার ইউজারনেম হবে',
-		'Shop password:' => 'দোকানের পাসওয়ার্ড:',
+		'Shop password' => 'দোকানের পাসওয়ার্ড',
 		'Must be letters and numbers with at least 8 characters' => 'কমপক্ষে ৮ অক্ষরের অক্ষর এবং সংখ্যায় হতে হবে',
-		'Re-type to confirm:' => 'নিশ্চিত করার জন্য আবার টাইপ করুন:',
+		'Re-type to confirm' => 'নিশ্চিত করার জন্য আবার টাইপ করুন',
 		'Sign-up to the newsletter' => 'নিউজলেটারে সাইন আপ করুন ',
 		'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'আপনার দোকান পরিচালনার অনুকূল  টিপস প্রেরণ করে একটি নিয়মিত ভিত্তিতে নির্দেশিকা দিয়ে PrestaShop আপনার ব্যবসা বৃদ্ধি করতে সহায়তা করবে।আপনি এই টিপস পেতে না চাইলে এই বাক্সটি আনচেক করুন।',
-		'Configure your database by filling out the following fields:' => 'নিম্নলিখিত ক্ষেত্রগুলি পূরণ করে আপনার ডাটাবেস কনফিগার করুন:',
+		'Configure your database by filling out the following fields' => 'নিম্নলিখিত ক্ষেত্রগুলি পূরণ করে আপনার ডাটাবেস কনফিগার করুন',
 		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">ডেটাবেস তৈরি করুন</a> to collect all of your store’s data-related activities.' => 'PrestaShop ব্যবহার করতে আপনাকে অবশ্যই <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">ডাটাবেস তৈরি করুন এ</a>আপনার দোকান এর তথ্য সংক্রান্ত কার্যক্রম পূরণ করতে হবে',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'PrestaShop আপনার ডাটাবেসের সাথে সংযোগ করার জন্য নীচের ক্ষেত্রগুলি পূরণ করুন.',
-		'Database server address:' => 'ডাটাবেস সার্ভারের ঠিকানা:',
+		'Database server address' => 'ডাটাবেস সার্ভারের ঠিকানা',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'ডিফল্ট পোর্ট হল 3306।ভিন্ন পোর্ট ব্যবহার করতে হলে আপনার সার্ভারের ঠিকানা এবং শেষে পোর্ট সংখ্যা যোগ করুন।যেমন-":4242". ',
-		'Database name:' => 'ডেটাবেস নাম:',
-		'Database login:' => 'ডাটাবেস লগইন:',
-		'Database password:' => 'ডাটাবেজ পাসওয়ার্ড:',
-		'Database Engine:' => 'ডাটাবেস ইঞ্জিন:',
-		'Tables prefix:' => 'টেবিল প্রিফিক্সঃ',
-		'Drop existing tables (mode dev):' => 'বিদ্যমান টেবিল ড্রপ করুন(mode dev):',
+		'Database name' => 'ডেটাবেস নাম',
+		'Database login' => 'ডাটাবেস লগইন',
+		'Database password' => 'ডাটাবেজ পাসওয়ার্ড',
+		'Database Engine:' => 'ডাটাবেস ইঞ্জিন',
+		'Tables prefix' => 'টেবিল প্রিফিক্সঃ',
+		'Drop existing tables (mode dev)' => 'বিদ্যমান টেবিল ড্রপ করুন(mode dev)',
 		'Test your database connection now!' => 'এখন আপনার ডাটাবেস সংযোগ পরীক্ষা করুন!',
 		'E-mail delivery set-up' => 'ই মেইল ​​বিতরণের সেট আপ',
 		'Configure SMTP manually (advanced users only)' => 'নিজে SMTP-কনফিগার করুন(দক্ষ ব্যবহারকারীদের জন্য শুধুমাত্র)',
 		'By default, the PHP mail() function is used' => 'ডিফল্টরূপে পিএইচপি মেইল ​​() ফাংশন ব্যবহার করা হয়েছে',
-		'SMTP server address:' => 'SMTP সার্ভারের ঠিকানা:',
-		'Encryption:' => 'এনক্রিপশন:',
+		'SMTP server address:' => 'SMTP সার্ভারের ঠিকানা',
+		'Encryption:' => 'এনক্রিপশন',
 		'None' => 'কোনোটা না',
-		'Port:' => 'পোর্ট:',
-		'Login:' => 'লগইন:',
-		'Password:' => 'পাসওয়ার্ড:',
+		'Port:' => 'পোর্ট',
+		'Login:' => 'লগইন',
+		'Password' => 'পাসওয়ার্ড',
 		'enter@your.email' => 'enter@your.email ',
 		'Send me a test email!' => 'আমাকে একটা পরীক্ষামূলক ইমেল প্রেরণ করুন!',
 		'Next' => 'পরবর্তী ',
@@ -177,8 +177,8 @@ return array(
 		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'আপনি বাম কলামের পিছনে ফেরার লিঙ্ক দিয়ে আগের ধাপে ফিরে যেতে পারেন অথবা ইনস্টলেশন প্রক্রিয়া পুনরায় আরম্ভ করুন-<a href="%s">clicking here</a>. হতে',
 		'Your installation is finished!' => 'আপনার ইনস্টলেশন সমাপ্ত!',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => ' আপনার দোকান ইনস্টল সমাপ্ত হয়েছে. PrestaShop ব্যবহারের জন্য আপনাকে ধন্যবাদ!',
-		'Please remember your login information:' => 'আপনার লগইন তথ্য দয়া করে মনে রাখবেন:',
-		'E-mail:' => 'ই মেইল:',
+		'Please remember your login information' => 'আপনার লগইন তথ্য দয়া করে মনে রাখবেন',
+		'E-mail' => 'ই মেইল',
 		'Print my login information' => 'আপনার লগইন তথ্য মুদ্রণ করুন',
 		'Display' => 'প্রদর্শন ',
 		'For security purposes, you must delete the "install" folder.' => 'নিরাপত্তার জন্য "install" ফোল্ডার মুছে ফেলা আবশ্যক.',
@@ -195,11 +195,13 @@ return array(
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => ' নীচের আইটেম (গুলি) দয়া করে সঠিক করুন তারপর আপনার নতুন সিস্টেম সামঞ্জস্যের পরীক্ষা করতে "Refresh information" ক্লিক করুন',
 		'Refresh these settings' => 'এই সেটিংস রিফ্রেশ করুন',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop চালাতে অন্তত 32M মেমরি প্রয়োজন।php.ini তে আপনার মেমরি চেক করুন অথবা অথবা আপনার হোস্ট সরবরাহকারীর সাথে যোগাযোগ করুন।',
-		'Welcome to the PrestaShop %s Installer.' => 'PrestaShop  ইনস্টলার  %s এ স্বাগতম',
+		'Welcome to the PrestaShop %s Installer' => 'PrestaShop  ইনস্টলার  %s এ স্বাগতম',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'PrestaShop ইনস্টলেশনের দ্রুত এবং সহজ।মাত্র কয়েক মুহূর্তের মধ্যে, আপনি আরও ১৫০০০০ ব্যাবসায়ি নিয়ে গঠিত একটি কমিউনিটির অংশ হয়ে যাবেন।আপনি প্রতিদিন সহজে পরিচালনা করতে পারবেন এমন একটি নিজস্ব অনন্য অনলাইন দোকান নির্মাণ করতে যাচ্ছেন।',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">আমাদের নত্থি করন</a> or to contact our support team: %2$s' => 'যদি আপনার সাহায্যের প্রয়োজন হলে, <a href="%1$s" target="_blank">আমাদের ম্যানুয়াল</a>চেক করতে বিব্রত বোধ করবেন না অথবা আমাদের সহায়ক দলের সাথে যোগাযোগ করুন: %2$s ',
-		'Continue the installation in:' => 'ইনস্টলেশন চালিয়ে যান:',
+		'Continue the installation in' => 'ইনস্টলেশন চালিয়ে যান',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'উপরোক্ত ভাষা নির্বাচন শুধুমাত্র ইনস্টলেশনের সহকারীর জন্য প্রযোজ্য।আপনার দোকান ইনস্টল করা হলে,আপনি উপর থেকে আপনার দোকানের ভাষা নির্বাচন করতে পারবেন একদম বিনামূল্যে!',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => ' যদি আপনার কোনো সাহায্যের দরকার হয়,তবে আমাদের নত্থিপত্র<a href="%1$s" target="_blank">চেক করতে দ্বিধা করবেন না</a> অথবা আমাদের সাপোর্ট টিম এর সাথে যোগাযোগ করুন: %2$s ',
+		'Must be at least 8 characters' => 'আট অক্ষর নূন্যতম',
+		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'PrestaShop ব্যবহার করতে আপনাকে অবশ্যই <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">ডাটাবেস তৈরি করুন এ</a>আপনার দোকান এর তথ্য সংক্রান্ত কার্যক্রম পূরণ করতে হবে',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php
index a397797ce..f2db6fdec 100644
--- a/install-dev/langs/br/install.php
+++ b/install-dev/langs/br/install.php
@@ -12,7 +12,7 @@ return array(
 		'menu_database' => 'Configuração do Sistema',
 		'menu_configure' => 'Informação da Loja',
 		'menu_process' => 'Instalação da Loja',
-		'Choose the installer language:' => 'Escolha a língua para instalação :',
+		'Choose the installer language:' => 'Escolha a língua para instalação',
 		'Field required' => 'Campos requeridos',
 		'Invalid shop name' => 'Nome da loja inválido',
 		'Your firstname contains some invalid characters' => 'Seu primeiro nome contém alguns caractéres inválidos',
@@ -65,13 +65,13 @@ return array(
 		'Install demonstration data' => 'Demonstração de instalação do produto',
 		'Install theme' => 'Instale o tema',
 		'Send information e-mail' => 'Envio de informações por e-mail',
-		'PHP parameters:' => 'Parâmetros PHP :',
+		'PHP parameters:' => 'Parâmetros PHP',
 		'Is PHP 5.1.2 or later installed ?' => 'PHP 5.1.2 ou posterior está instalado ?',
 		'Can upload files ?' => 'Pode enviar arquivos ?',
 		'Can create new files and folders ?' => 'Pode criar novos arquivos e pastas ?',
 		'Is GD Library installed ?' => 'Biblioteca GD está instalada ?',
 		'Is MySQL support is on ?' => 'MySQL está instalado ?',
-		'Recursive write permissions on files and folders:' => 'Grave permissões em arquivos e pastas recursivas:',
+		'Recursive write permissions on files and folders:' => 'Grave permissões em arquivos e pastas recursivas',
 		'Can open external URLs ?' => 'Pode abrir URLs externas ?',
 		'Is PHP register global option off (recommended) ?' => 'A opção de registro global PHP está desligada(recomendado) ?',
 		'Is GZIP compression activated (recommended) ?' => 'A compressão GZIP está ativada (recomendado) ?',
@@ -80,48 +80,48 @@ return array(
 		'Is Dom extension loaded ?' => 'A extensão DOM está carregada ?',
 		'Is PDO MySQL extension loaded ?' => 'A extensão PDO MySQL está carregada ?',
 		'Shop settings and merchant account information' => 'Informações sobre o vendedor e a loja',
-		'Shop name:' => 'O nome da sua loja :',
-		'Main activity:' => 'Principal atividade :',
+		'Shop name' => 'O nome da sua loja',
+		'Main activity' => 'Principal atividade',
 		'Please choose your main activity' => 'Por favor escolha sua atividade principal',
 		'Other activity...' => 'Outra atividade ...',
 		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'Esta informação não é necessária, ela será usada apenas para fins estatísticos. Esta informação não muda nada em sua loja.',
-		'Install demo products:' => 'Instalar produtos de demonstração :',
+		'Install demo products' => 'Instalar produtos de demonstração',
 		'Yes' => 'Sim',
 		'No' => 'Não',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Produtos de demonstração são uma boa maneira de aprender como usar o PrestaShop. Você deve instalá-los se você não está familiarizado com a plataforma.',
-		'Default country:' => 'País padrão :',
+		'Default country:' => 'País padrão',
 		'Select your country' => 'Selecione seu país',
-		'Shop timezone:' => 'Fuso horário da loja :',
+		'Shop timezone:' => 'Fuso horário da loja',
 		'Select your timezone' => 'Selecione o seu fuso horário',
 		'Shop logo:' => 'Logo da loja',
-		'Recommended dimensions:' => 'Dimensões recomendadas :',
-		'First name:' => 'Primeiro nome :',
-		'Last name:' => 'Sobrenome :',
-		'E-mail address:' => 'Endereço de e-mail :',
-		'Shop password:' => 'Senha da loja :',
-		'Re-type to confirm:' => 'Digite novamente para confirmar&nbsp;:',
+		'Recommended dimensions:' => 'Dimensões recomendadas',
+		'First name' => 'Primeiro nome',
+		'Last name' => 'Sobrenome',
+		'E-mail address' => 'Endereço de e-mail',
+		'Shop password' => 'Senha da loja',
+		'Re-type to confirm' => 'Digite novamente para confirmar&nbsp;',
 		'Receive this information by e-mail' => 'Receba esta informação por e-mail',
 		'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Atenção: Você receberá esta informação apenas se a configuração do seu e-mail está correta.',
-		'Configure your database by filling out the following fields:' => 'Configure o seu banco de dados, preencha os seguintes campos :',
+		'Configure your database by filling out the following fields' => 'Configure o seu banco de dados, preencha os seguintes campos',
 		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => 'Você tem que criar um banco de dados, você encontra ajuda em <a href="http://doc.prestashop.com" target="_blank">nossa documentação on line</a>.',
-		'Database server address:' => 'Endereço do servidor do banco de dados :',
+		'Database server address' => 'Endereço do servidor do banco de dados',
 		'If you want to use a different port, add :XX after your server address where XX is your port number.' => 'Se você quiser usar um port diferente, adicione: XX após o endereço do servidor, onde XX é o número do seu port.',
-		'Database name:' => 'Nome do banco de dados :',
-		'Database login:' => 'Login do banco de dados :',
-		'Database password:' => 'Senha do banco de dados :',
-		'Database Engine:' => 'Tipo do banco de dados :',
-		'Tables prefix:' => 'Prefixo das tabelas :',
-		'Drop existing tables (mode dev):' => 'Exclua as tabelas existentes (mode dev) :',
+		'Database name' => 'Nome do banco de dados',
+		'Database login' => 'Login do banco de dados',
+		'Database password' => 'Senha do banco de dados',
+		'Database Engine:' => 'Tipo do banco de dados',
+		'Tables prefix' => 'Prefixo das tabelas',
+		'Drop existing tables (mode dev)' => 'Exclua as tabelas existentes (mode dev)',
 		'Verify now!' => 'Verifique agora !',
 		'E-mail delivery set-up' => 'Configuração de entrega de e-mails',
 		'Configure SMTP manually (advanced users only)' => 'Configuração manual do SMTP (apenas para usuários avançados)',
 		'By default, the PHP mail() function is used' => 'Por padrão, é usada a função PHP mail()',
 		'SMTP server address:' => 'Endereço do servidor SMTP',
-		'Encryption:' => 'Encriptação :',
+		'Encryption:' => 'Encriptação',
 		'None' => 'Nenhum',
-		'Port:' => 'Port :',
-		'Login:' => 'Identificação :',
-		'Password:' => 'Senha :',
+		'Port:' => 'Port',
+		'Login:' => 'Identificação',
+		'Password' => 'Senha',
 		'enter@your.email' => 'colocar@seu.email',
 		'Send me a test email!' => 'Envie-me um email de teste !',
 		'Next' => 'Próximo',
@@ -137,7 +137,7 @@ return array(
 		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'Você pode usar os links da coluna da esquerda para voltar às etapas anteriores, ou reiniciar o processo de instalação ao <a href="%s">clicar aqui</a>.',
 		'Your installation is finished!' => 'Você acabou a instalação !',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => 'Você acaba de terminar de instalar sua loja. Obrigado por utilizar o PrestaShop !',
-		'Please remember your login information:' => 'Por favor, memorize suas informações de identificação :',
+		'Please remember your login information' => 'Por favor, memorize suas informações de identificação',
 		'WARNING: For security purposes, you must delete the "install" folder.' => 'ATENÇÃO : Por questão de segurança, você deve deletar a pasta "/install/".',
 		'Back Office' => 'Área Administrativa',
 		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'Gerencie sua loja usando sua Área Administrativa. Gerencie seus pedidos e clientes, adicione módulos, mude temas, etc...',
@@ -147,10 +147,10 @@ return array(
 		'Discover your store' => 'Conheça sua loja',
 		'Required set-up. Please verify the following checklist items are true.' => 'Configuração obrigatória. Por favor, verifique que os seguintes ítens da lista sejam verdadeiros.',
 		'Your configuration is valid, click next to continue!' => 'Sua configuração está válida, clique próximo para continuar !',
-		'Your configuration is invalid. Please fix the issues below:' => 'Sua configuração está inválida. Por favor arrume os erros abaixo :',
+		'Your configuration is invalid. Please fix the issues below:' => 'Sua configuração está inválida. Por favor arrume os erros abaixo',
 		'Optional set-up' => 'Configuração opcional',
 		'Refresh these settings' => 'Atualize estas configurações',
-		'Welcome to the PrestaShop %s Installer.' => 'Bem-vindo ao Instalador % do PrestaShop.',
+		'Welcome to the PrestaShop %s Installer' => 'Bem-vindo ao Instalador % do PrestaShop',
 		'The installation process should take only few minutes!' => 'O processo de instalação deve levar apenas alguns minutos! !',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Se você precisar de ajuda, não deixe de visitar <a href="%1$s" target="_blank">nossa documentação</a> ou contatar nossa equipe de suporte : %2$s',
 		'Did you know?' => 'Você sabia ?',
@@ -213,7 +213,7 @@ return array(
 		'PrestaShop compatibility with your system environment has been verified!' => 'A compatibilidade do PrestaShop com seu ambiente de sistema foi verificada!',
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => 'Ups! Por favor corrija o(s)  item(s) abaixo, e depois clique “Atualizar Informação” para testar a compatibilidade do seu novo sistema.',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'A instalação do PrestaShop é rápida e fácil. Em alguns minutos, você vai se tornar parte de uma comunidade composta por mais de 150 mil comerciantes. Você está no caminho certo para criar sua própria loja virtual original que você pode gerenciar facilmente todos os dias.',
-		'Continue the installation in:' => 'Continue a instalação em:',
+		'Continue the installation in' => 'Continue a instalação em',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'A seleção de idioma acima é válida somente para o Assistente de  Instalação. Uma vez que a loja for instalada, você pode escolher o idioma da sua loja entre mais de %d traduções disponíveis, totalmente grátis!',
 		'The field %s is limited to %d characters' => 'O campo %s está limitado a %d caractéres',
 		'An error occurred during logo copy.' => 'Um erro ocorreu durante a cópia da logo',
@@ -235,19 +235,22 @@ return array(
 		'Sign-up to the newsletter' => 'Inscreva-se para a newsletter',
 		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Se você está tendo problemas durante o processo de instalação, por favor ligue para o nosso time no %s e um de nossos especialistas lhe ajudará.',
 		'Contact us!' => 'Contate-nos!',
-		'E-mail:' => 'E-mail:',
+		'E-mail' => 'E-mail',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop requer pelo menos 32M de memória para funcionar, por favor verifique memory_limit no php.ini ou contate seu provedor de hospedagem.',
 		'Your PHP sessions path is not writable - check with your hosting provider:' => 'O caminho para sessão PHP não pode  ser escrito - verifique com o seu provedor de hospedagem',
 		'Database is created' => 'Banco de dados está criado',
 		'Cannot create the database automatically' => 'Não é possível criar o banco de dados automaticamente',
-		'Install modules Addons' => 'Instalar módulos Addons',
+		'Install Addons modules' => 'Instalar módulos Addons',
 		'Attempt to create the database automatically' => 'Tentativa de criar o banco de dados automaticamente',
-		'Country:' => 'País:',
+		'Country' => 'País',
 		'Must be letters and numbers with at least 8 characters' => 'Deve ser letras e números com pelo menos 8 caractéres',
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Para instalar o PrestaShop, você precisa ter JavaScript ativado no seu navegador',
 		'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Para aproveitar os muitos recursos que são oferecidos grátis pelo PrestaShop, por favor, leia os termos de licença abaixo. O núcleo do PrestaShop é licenciado sob OSL 3.0, enquanto os módulos e temas são licenciados sob AFL 3.0.',
 		'For security purposes, you must delete the "install" folder.' => 'Por questões de segurança, você deve deletar a pasta "install"',
 		'Files' => 'Arquivos',
 		'All files are not successfuly uploaded on your server' => 'Todos os arquivos não foram carregados no seu servidor com sucesso',
+		'Must be at least 8 characters' => 'Mínimo de 8 caracteres',
+		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
+		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php
index 5b56f894d..cd5ea0518 100644
--- a/install-dev/langs/de/install.php
+++ b/install-dev/langs/de/install.php
@@ -61,13 +61,13 @@ return array(
 		'Install modules' => 'Module werden installiert',
 		'Install demonstration data' => 'Demo wird installiert',
 		'Install theme' => 'Thema wird installiert',
-		'PHP parameters:' => 'PHP-Parameter:',
+		'PHP parameters:' => 'PHP-Parameter',
 		'Is PHP 5.1.2 or later installed ?' => 'Is PHP 5.1.2. oder höher installiert ?',
 		'Can upload files ?' => 'Können Dateien hochgeladen werden ?',
 		'Can create new files and folders ?' => 'Können neue Dateien und Ordner erstellt weden ?',
 		'Is GD Library installed ?' => 'Ist GD-Library installiert ?',
 		'Is MySQL support is on ?' => 'Ist MySQL-Support aktiviert ?',
-		'Recursive write permissions on files and folders:' => 'Schreibrechte in Dateien und Ordner:',
+		'Recursive write permissions on files and folders:' => 'Schreibrechte in Dateien und Ordner',
 		'Can open external URLs ?' => 'Können externe URLs geöffnet werden',
 		'Is PHP register global option off (recommended) ?' => 'Ist register global auf off (emfohlen)?',
 		'Is GZIP compression activated (recommended) ?' => 'Ist GZIP Kompression aktiviert (empfohlen)?',
@@ -76,48 +76,48 @@ return array(
 		'Is Dom extension loaded ?' => 'Ist DOM geladen ?',
 		'Is PDO MySQL extension loaded ?' => 'Ist PDO MySQL geladen ?',
 		'Shop settings and merchant account information' => 'Shopinformationen über den Verkäufer',
-		'Shop name:' => 'Name Ihres Shops:',
-		'Main activity:' => 'Branchenzugehörigkeit',
+		'Shop name' => 'Name Ihres Shops',
+		'Main activity' => 'Branchenzugehörigkeit',
 		'Please choose your main activity' => 'Bitte wählen Sie Ihre Branchenzugehörigkeit',
 		'Other activity...' => 'Andere...',
 		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'Diese Information ist nicht erforderlich, sie wird zu statistischen Zwecken verwendet. Diese Information ändert nichts in Ihrem Shop.',
-		'Install demo products:' => 'Demoprodukte installieren:',
+		'Install demo products' => 'Demoprodukte installieren',
 		'Yes' => 'Ja',
 		'No' => 'Nein',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Demo-Produkte sind eine gute Möglichkeit die Funktionen des Shops näher kennzulernen. Wir empfehlen Ihnen daher diese zu installieren. Sie können die Produkte im Back-Office jederzeit nachträglich deaktivieren oder löschen',
-		'Default country:' => 'Standard-Land:',
+		'Default country:' => 'Standard-Land',
 		'Select your country' => 'Wählen Sie Ihr Land',
-		'Shop timezone:' => 'Zeitzone des Shops:',
+		'Shop timezone:' => 'Zeitzone des Shops',
 		'Select your timezone' => 'Wählen Sie Ihre Zeitzone',
-		'Shop logo:' => 'Shop-Logo:',
-		'Recommended dimensions:' => 'Empfohlene Abmessungen:',
-		'First name:' => 'Vorname:',
-		'Last name:' => 'Name:',
-		'E-mail address:' => 'E-Mail-Adresse:',
-		'Shop password:' => 'Kennwort des Shops:',
-		'Re-type to confirm:' => 'Bestätigen Sie das Kennwort:',
+		'Shop logo:' => 'Shop-Logo',
+		'Recommended dimensions:' => 'Empfohlene Abmessungen',
+		'First name' => 'Vorname',
+		'Last name' => 'Name',
+		'E-mail address' => 'E-Mail-Adresse',
+		'Shop password' => 'Kennwort des Shops',
+		'Re-type to confirm' => 'Bestätigen Sie das Kennwort',
 		'Receive this information by e-mail' => 'Meine Einstellungen per E-Mail erhalten',
 		'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Hinweis: Sie erhalten diese Information nur, wenn Ihre Mail-Einstellungen korrekt sind',
-		'Configure your database by filling out the following fields:' => 'Konfigurieren Sie Ihre Datenbank, indem Sie  folgende Felder ausfüllen:',
+		'Configure your database by filling out the following fields' => 'Konfigurieren Sie Ihre Datenbank, indem Sie  folgende Felder ausfüllen',
 		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => '',
-		'Database server address:' => 'Datenbank-Adresse',
+		'Database server address' => 'Datenbank-Adresse',
 		'If you want to use a different port, add :XX after your server address where XX is your port number.' => 'Möchten Sie einen anderen Port verwenden, fügen Sie hinter der Datenbank-Adresse :XX hinzu. XX steht für die Port-Nummer',
-		'Database name:' => 'Name der Datenbank:',
-		'Database login:' => 'Datenbank Benutzer:',
-		'Database password:' => 'Datenbank Kennwort:',
-		'Database Engine:' => 'Datenbank-Engine:',
-		'Tables prefix:' => 'Tabellen-Präfixe:',
-		'Drop existing tables (mode dev):' => 'Vorhandene Tabellen löschen:',
+		'Database name' => 'Name der Datenbank',
+		'Database login' => 'Datenbank Benutzer',
+		'Database password' => 'Datenbank Kennwort',
+		'Database Engine:' => 'Datenbank-Engine',
+		'Tables prefix' => 'Tabellen-Präfixe',
+		'Drop existing tables (mode dev)' => 'Vorhandene Tabellen löschen',
 		'Verify now!' => 'Jetz prüfen',
 		'E-mail delivery set-up' => 'E-Mail Einstellungen',
 		'Configure SMTP manually (advanced users only)' => 'Konfigurieren des SMTP-Mailversandes (nur für Fortgeschrittene Nutzer)',
 		'By default, the PHP mail() function is used' => 'Standardmäßig wird PHP mail () Funktion verwendet',
 		'SMTP server address:' => 'SMTP-Server-Adresse',
-		'Encryption:' => 'Verschlüsselung:',
+		'Encryption:' => 'Verschlüsselung',
 		'None' => 'Keine',
-		'Port:' => 'Port:',
-		'Login:' => 'Benutzername:',
-		'Password:' => 'Kennwort:',
+		'Port:' => 'Port',
+		'Login:' => 'Benutzername',
+		'Password' => 'Kennwort',
 		'enter@your.email' => 'enter@your.email ',
 		'Send me a test email!' => 'Eine Test-E-Mail an mich senden!',
 		'Next' => 'Weiter',
@@ -133,7 +133,7 @@ return array(
 		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'Um zum vorherigen Schritt zu gelangen, können Sie die Links in der Linken Spalte nutzen, oder den Installationsprozess komplett neu starten wenn Sie <a href="%s">HIER klicken</a>.',
 		'Your installation is finished!' => 'Die Installation ist abgeschlossen!',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => 'Sie haben soeben Ihren Shop erfolgreich installiert. Danke dass Sie Prestashop nutzen',
-		'Please remember your login information:' => 'Merken Sie sich Ihre Log-In-Daten',
+		'Please remember your login information' => 'Merken Sie sich Ihre Log-In-Daten',
 		'WARNING: For security purposes, you must delete the "install" folder.' => 'HINWEIS: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\'.',
 		'Back Office' => 'Back Office',
 		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'Verwalten Sie Ihren Shop im Back-Office. Verwalten Sie Ihre Bestellungen und Kunden, fügen Sie Module hinzu, ändern Sie Ihr Theme, usw. ...',
@@ -143,10 +143,10 @@ return array(
 		'Discover your store' => 'Meinen Shop entdecken',
 		'Required set-up. Please verify the following checklist items are true.' => 'Erforderliche Mindestanforderungen und Einstellungen. Bitte überprüfen Sie die Checkliste',
 		'Your configuration is valid, click next to continue!' => 'Ihre Server-Einstellugnen sind gültig, bitte klicken Sie auf weiter',
-		'Your configuration is invalid. Please fix the issues below:' => 'Ihre Konfiguration ist nicht gültig, <br /> bitte beheben Sie diese Probleme:',
+		'Your configuration is invalid. Please fix the issues below:' => 'Ihre Konfiguration ist nicht gültig, <br /> bitte beheben Sie diese Probleme',
 		'Optional set-up' => 'Optionale Einstellungen',
 		'Refresh these settings' => 'Einstellungen aktualisieren',
-		'Welcome to the PrestaShop %s Installer.' => 'Herzlich Willkommen beim PrestaShop Installationsassistenten',
+		'Welcome to the PrestaShop %s Installer' => 'Herzlich Willkommen beim PrestaShop Installationsassistenten',
 		'The installation process should take only few minutes!' => 'Der Installationsprozess dauert nur ein paar Minuten!',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Falls Sie Hilfe benötigen, haben Sie folgende Möglichkeiten: <a href="%1$s" target="_blank">unsere Dokumentation einsehen</a> oder unser Support-Team zu kontaktieren: %2$s',
 		'Did you know?' => 'Wussten Sie schon?',
@@ -205,7 +205,7 @@ return array(
 		'We are currently checking PrestaShop compatibility with your system environment' => 'Wir überprüfen derzeit die Kompatibilität von PrestaShop mit Ihrer Systemumgebung.',
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => 'Bitte korrigieren Sie untenstehende(n) Punkt(e) und klicken Sie anschließend auf den Refresh-Button, um erneut die Kompatibilität Ihres Systems zu überprüfen.',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'Die PrestaShop-Installation ist schnell und einfach. In nur wenigen Minuten werden Sie Teil einer Community aus über 150 000 Händlern und erstellen einen Onlineshop, der genau zu Ihnen passt und der einfach in der täglichen Verwaltung ist.',
-		'Continue the installation in:' => 'Die Installation fortführen als:',
+		'Continue the installation in' => 'Die Installation fortführen als',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'Die untenstehende Sprachauswahl bezieht sich auf den Installationsassistenten. Sobald Ihr Shop installiert ist, können Sie aus %d Sprachen Ihre Shopsprache wählen!',
 		'An error occurred during logo copy.' => 'Beim Logo Copy ist ein Fehler aufgetreten.',
 		'The field %s is limited to %d characters' => 'Dieses Feld %s ist auf %s Zeichen begrenzt.',
@@ -229,21 +229,24 @@ return array(
 		'Sign-up to the newsletter' => 'Für den Newsletter anmelden',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Bitte füllen Sie die untenstehenden Felder aus, damit PrestaShop sich mit Ihrer Datenbank verbinden kann.',
 		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Wenn während des Installationsprozesses technische Schwierigkeiten auftreten, kontaktieren Sie bitte unser Team unter %s. Ein Experte ist Ihnen gerne behilflich!',
-		'E-mail:' => 'E-Mail:',
+		'E-mail' => 'E-Mail',
 		'Display' => 'Anzeige',
 		'PrestaShop compatibility with your system environment has been verified!' => 'Die Kompatibilität von PrestaShop mit Ihrem System wurde überprüft!',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'Damit PrestaShop einwandfrei funktionieren kann, werden mindestens 32M Speicher benötigt. Bitte überprüfen Sie die  memory_limit directive in php.in oder kontaktieren Sie Ihrem Provider.',
 		'Your PHP sessions path is not writable - check with your hosting provider:' => 'Der Speicherungsordner ist nicht beschreibbar - bitte kontaktieren Sie Ihren Provider',
 		'Database is created' => 'Datenbank erstellt',
 		'Cannot create the database automatically' => 'Datenbank kann nicht automatisch erstellt werden',
-		'Install modules Addons' => 'Module Addons installieren',
+		'Install Addons modules' => 'Module Addons installieren',
 		'Files' => 'Dateien',
 		'All files are not successfuly uploaded on your server' => 'Es wurden nicht alle Dateien erfolgreich auf Ihren Server hochgeladen',
 		'Attempt to create the database automatically' => 'Versuchen, die Datenbank automatisch zu erstellen.',
-		'Country:' => 'Land:',
+		'Country' => 'Land',
 		'Must be letters and numbers with at least 8 characters' => 'Zulässig sind Buchstaben und Nummern. Mindestens 8 Zeichen.',
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'JavaScript muss in Ihrem Browser aktiviert sein, um PrestaShop zu installieren.',
 		'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Um all die Vorteile zu nutzen, die Ihnen Prestashop bietet, lesen sie bitte die folgenden Bedingungen. Der PrestaShop ist unter OSL 3.0 lizensiert, die Module und Themen unter AFL 3.0.',
 		'For security purposes, you must delete the "install" folder.' => 'For security purposes, you must delete the "install" folder. - Aus Sicherheitsgründen sollten Sie das Verzeichnis “install” unbedingt löschen.',
+		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
+		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
+		'Must be at least 8 characters' => 'Mindestens 8 Zeichen',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php
index 2375e9b89..6c4eb33da 100644
--- a/install-dev/langs/es/install.php
+++ b/install-dev/langs/es/install.php
@@ -62,13 +62,13 @@ return array(
 		'Install modules' => 'Instalar módulos',
 		'Install demonstration data' => 'Instalar datos de prueba (DEMO)',
 		'Install theme' => 'Instalar plantilla',
-		'PHP parameters:' => 'Parámetros PHP:',
+		'PHP parameters:' => 'Parámetros PHP',
 		'Is PHP 5.1.2 or later installed ?' => '',
 		'Can upload files ?' => '',
 		'Can create new files and folders ?' => '',
 		'Is GD Library installed ?' => '',
 		'Is MySQL support is on ?' => '',
-		'Recursive write permissions on files and folders:' => 'Permisos de escritura recursivos en ficheros y directorios:',
+		'Recursive write permissions on files and folders:' => 'Permisos de escritura recursivos en ficheros y directorios',
 		'Can open external URLs ?' => '',
 		'Is PHP register global option off (recommended) ?' => '',
 		'Is GZIP compression activated (recommended) ?' => '',
@@ -77,48 +77,48 @@ return array(
 		'Is Dom extension loaded ?' => '',
 		'Is PDO MySQL extension loaded ?' => '',
 		'Shop settings and merchant account information' => 'Información sobre el vendedor',
-		'Shop name:' => 'Nombre de la tienda:',
-		'Main activity:' => 'Actividad principal:',
+		'Shop name' => 'Nombre de la tienda',
+		'Main activity' => 'Actividad principal',
 		'Please choose your main activity' => 'Por favor, selecciona tu actividad principal',
 		'Other activity...' => 'Otra actividad...',
 		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'Esta información no es obligatoria, solo se utilizará para estadísticas. Proporcionarla o no, no cambiará nada en su tienda.',
-		'Install demo products:' => 'Instalar productos de prueba (DEMO):',
+		'Install demo products' => 'Instalar productos de prueba (DEMO)',
 		'Yes' => 'Sí',
 		'No' => 'No',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Los productos de prueba son una buena forma de aprender a utilizar PrestaShop. Te recomendamos instalarlo si todavía no estás familiarizado con él.',
-		'Default country:' => 'País por defecto:',
+		'Default country:' => 'País por defecto',
 		'Select your country' => 'Selecciona tu país',
-		'Shop timezone:' => 'Zona horaria de la tienda:',
+		'Shop timezone:' => 'Zona horaria de la tienda',
 		'Select your timezone' => 'Selecciona tu zona horaria',
-		'Shop logo:' => 'Logo de la tienda:',
-		'Recommended dimensions:' => 'Dimensiones recomendadas:',
-		'First name:' => 'Nombre:',
-		'Last name:' => 'Apellido:',
-		'E-mail address:' => 'Dirección de correo electrónico:',
-		'Shop password:' => 'Contraseña de la tienda:',
-		'Re-type to confirm:' => 'Confirmar la contraseña:',
+		'Shop logo:' => 'Logo de la tienda',
+		'Recommended dimensions:' => 'Dimensiones recomendadas',
+		'First name' => 'Nombre',
+		'Last name' => 'Apellido',
+		'E-mail address' => 'Dirección de correo electrónico',
+		'Shop password' => 'Contraseña de la tienda',
+		'Re-type to confirm' => 'Confirmar la contraseña',
 		'Receive this information by e-mail' => 'Recibe estos datos por email',
 		'Warning: You will receive this information only if your e-mail configuration is correct.' => '',
-		'Configure your database by filling out the following fields:' => 'Configura tu base de datos rellenando los siguientes campos:',
+		'Configure your database by filling out the following fields' => 'Configura tu base de datos rellenando los siguientes campos',
 		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => '',
-		'Database server address:' => 'Dirección del servidor de base de datos:',
+		'Database server address' => 'Dirección del servidor de base de datos',
 		'If you want to use a different port, add :XX after your server address where XX is your port number.' => '',
-		'Database name:' => 'Nombre de la base de datos:',
-		'Database login:' => 'Usuario de la base de datos:',
-		'Database password:' => 'Contraseña de la base de datos:',
-		'Database Engine:' => 'Motor de la base de datos:',
-		'Tables prefix:' => 'Prefijo de las tablas:',
-		'Drop existing tables (mode dev):' => 'Eliminar las tablas existentes (sólo para modo desarrollo):',
+		'Database name' => 'Nombre de la base de datos',
+		'Database login' => 'Usuario de la base de datos',
+		'Database password' => 'Contraseña de la base de datos',
+		'Database Engine:' => 'Motor de la base de datos',
+		'Tables prefix' => 'Prefijo de las tablas',
+		'Drop existing tables (mode dev)' => 'Eliminar las tablas existentes (sólo para modo desarrollo)',
 		'Verify now!' => '',
 		'E-mail delivery set-up' => 'Configuración de la entrega del correo electrónico',
 		'Configure SMTP manually (advanced users only)' => 'Configurar SMTP manualmente (sólo para usuarios avanzados)',
 		'By default, the PHP mail() function is used' => 'Por defecto, la función PHP mail() es la que se utiliza',
-		'SMTP server address:' => 'Dirección del servidor SMTP:',
-		'Encryption:' => 'Cifrado:',
+		'SMTP server address:' => 'Dirección del servidor SMTP',
+		'Encryption:' => 'Cifrado',
 		'None' => 'Ninguno',
-		'Port:' => 'Puerto:',
-		'Login:' => 'Usuario:',
-		'Password:' => 'Contraseña:',
+		'Port:' => 'Puerto',
+		'Login:' => 'Usuario',
+		'Password' => 'Contraseña',
 		'enter@your.email' => 'introduce@tu.email',
 		'Send me a test email!' => '¡Enviar correo electrónico de prueba!',
 		'Next' => 'Siguiente',
@@ -134,7 +134,7 @@ return array(
 		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'Puedes utilizar los enlaces que se encuentran en la columna de la izquierda para volver a los pasos anteriores, o también reiniciar el proceso de instalación <a href="%s">haciendo clic aquí</a>.',
 		'Your installation is finished!' => '¡Tu instalación ha finalizado!',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => 'Acabas de finalizar la instalación de tu tienda. ¡Gracias por utilizar PrestaShop!',
-		'Please remember your login information:' => 'Por favor, recuerda la información de inicio de sesión:',
+		'Please remember your login information' => 'Por favor, recuerda la información de inicio de sesión',
 		'WARNING: For security purposes, you must delete the "install" folder.' => 'ATENCION: Por motivos de seguridad, debe borrar el directorio "install".',
 		'Back Office' => 'Interfaz de administración (Back Office)',
 		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'Administra tu tienda utilizando el interfaz de administración. Gestiona los pedidos y clientes, añade módulos, cambia plantillas, etc.',
@@ -144,10 +144,10 @@ return array(
 		'Discover your store' => 'Visita tu tienda',
 		'Required set-up. Please verify the following checklist items are true.' => '',
 		'Your configuration is valid, click next to continue!' => '',
-		'Your configuration is invalid. Please fix the issues below:' => 'Su configuración no es válida,<br />gracias por corregir la configuración:',
+		'Your configuration is invalid. Please fix the issues below:' => 'Su configuración no es válida,<br />gracias por corregir la configuración',
 		'Optional set-up' => 'Parámetros opcionales',
 		'Refresh these settings' => 'Actualizar esta información',
-		'Welcome to the PrestaShop %s Installer.' => 'Bienvenido al %s de Instalación de PrestaShop.',
+		'Welcome to the PrestaShop %s Installer' => 'Bienvenido al %s de Instalación de PrestaShop',
 		'The installation process should take only few minutes!' => 'El proceso de instalación tardará solo unos minutos.',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Si usted necesita ayuda, no dude en consultar <a href="%1$s" target="_blank">nuestra documentación </a> o contactar nuestro equipo de soporte: %2$s',
 		'Did you know?' => '¿Sabía que?',
@@ -207,7 +207,7 @@ return array(
 		'We are currently checking PrestaShop compatibility with your system environment' => 'Verificamos en este momento la compatibilidad de PrestaShop con tu entorno del sistema',
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => '¡Uups! Por favor corrija los siguientes puntos marcados como errores y después hacer Clic en el botón "Actualizar esta información" con el fin de probar de nuevo la compatibilidad de tu sistema.',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'La instalación de PrestaShop es rápida y fácil. En solo unos minutos, podrás unirte a una comunidad de más de 150.000 comerciantes electrónicos. Así podrás crear tu propia tienda Online con tu imagen corporativa y administrarla a diario de forma muy sencilla.',
-		'Continue the installation in:' => 'Continuar la instalación en:',
+		'Continue the installation in' => 'Continuar la instalación en',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'La elección del idioma se realiza sólo al inicio y se aplica al asistente de instalación. Una vez que tu tienda Online está instalada, podrás elegir el idioma de tu tienda, ¡entre las más de %d traducciones disponibles, ¡todas ellas de forma gratuitas!',
 		'The field %s is limited to %d characters' => 'El campo %s está limitado a %d caracteres',
 		'An error occurred during logo copy.' => 'Se ha producido un error durante la copia del logotipo.',
@@ -230,16 +230,16 @@ return array(
 		'Must be alphanumeric string with at least 8 characters' => 'Debe ser una cadena alfanumérica de al menos 8 caracteres',
 		'Sign-up to the newsletter' => 'Suscríbete al boletín de noticias',
 		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Si experimenta problemas durante la instalación, por favor llámenos al %s y uno de nuestros expertos estará encantado de ayudarte.',
-		'E-mail:' => 'Correo electrónico:',
+		'E-mail' => 'Correo electrónico',
 		'Display' => 'Mostrar',
 		'PrestaShop compatibility with your system environment has been verified!' => '¡La compatibilidad de PrestaShop con su entorno del sistema ha sido verificada correctamente!',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop requiere al menos 32MB de memoria para funcionar, por favor verifica la directiva memory_limit que se encuentra en el fichero php.ini o contacta con su proveedor de alojamiento',
 		'Your PHP sessions path is not writable - check with your hosting provider:' => 'El fichero de almacenamiento no está disponible en modo escritura, consulte con su proveedor de alojamiento',
 		'Database is created' => 'Base de datos se creada',
 		'Cannot create the database automatically' => 'No se puede crear la base de datos automáticamente',
-		'Install modules Addons' => 'Instalar módulos Addons',
+		'Install Addons modules' => 'Instalar módulos Addons',
 		'Attempt to create the database automatically' => 'Tentativa de crear la base de datos automáticamente',
-		'Country:' => 'País:',
+		'Country' => 'País',
 		'Must be letters and numbers with at least 8 characters' => 'Deben ser letras y números con un mínimo de 8 caracteres',
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Para instalar PrestaShop, usted necesita tener el Javascript activado en su navegador.',
 		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
@@ -248,5 +248,6 @@ return array(
 		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
 		'Files' => 'Ficheros',
 		'All files are not successfuly uploaded on your server' => 'Todos los ficheros no se han subido correctamente al servidor',
+		'Must be at least 8 characters' => 'Mínimo 8 caracteres',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php
index 068e83d6d..87afdd0ae 100644
--- a/install-dev/langs/fr/install.php
+++ b/install-dev/langs/fr/install.php
@@ -64,13 +64,13 @@ return array(
 		'Install demonstration data' => 'Installation des produits de démo',
 		'Install theme' => 'Installation du thème',
 		'Send information e-mail' => 'Envoi des informations par e-mail',
-		'PHP parameters:' => 'Paramètres PHP :',
+		'PHP parameters:' => 'Paramètres PHP',
 		'Is PHP 5.1.2 or later installed ?' => 'PHP 5.1.2 ou plus est installé ?',
 		'Can upload files ?' => 'Upload de fichiers autorisée ?',
 		'Can create new files and folders ?' => 'Création de fichiers et dossiers autorisée ?',
 		'Is GD Library installed ?' => 'Librairie GD installée ?',
 		'Is MySQL support is on ?' => 'MySQL est installé ?',
-		'Recursive write permissions on files and folders:' => 'Droits en écriture récursifs sur les fichiers / dossiers :',
+		'Recursive write permissions on files and folders:' => 'Droits en écriture récursifs sur les fichiers / dossiers',
 		'Can open external URLs ?' => 'Ouverture des URLs externes autorisée ?',
 		'Is PHP register global option off (recommended) ?' => 'Option PHP register_global désactivée (recommandé) ?',
 		'Is GZIP compression activated (recommended) ?' => 'Compression GZIP activée (recommandé) ?',
@@ -79,48 +79,48 @@ return array(
 		'Is Dom extension loaded ?' => 'Extension DOM installée ?',
 		'Is PDO MySQL extension loaded ?' => 'Extension PDO MySQL installée ?',
 		'Shop settings and merchant account information' => 'Informations à propos du marchand',
-		'Shop name:' => 'Nom de votre boutique :',
-		'Main activity:' => 'Activité principale :',
+		'Shop name' => 'Nom de votre boutique',
+		'Main activity' => 'Activité principale',
 		'Please choose your main activity' => 'Merci de choisir une activité',
 		'Other activity...' => 'Autre activité ...',
 		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'Cette information n\'est pas obligatoire, elle sera utilisée à des fins statistiques. Cette information ne changera rien dans votre boutique.',
-		'Install demo products:' => 'Installer les produits de démo :',
+		'Install demo products' => 'Installer les produits de démo',
 		'Yes' => 'Oui',
 		'No' => 'Non',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Les produits de démo sont un bon moyen pour apprendre à utiliser PrestaShop. Vous devriez les installer si vous n\'êtes pas familier avec le logiciel.',
-		'Default country:' => 'Pays par défaut :',
+		'Default country:' => 'Pays par défaut',
 		'Select your country' => 'Sélectionnez un pays',
-		'Shop timezone:' => 'Fuseau horaire :',
+		'Shop timezone:' => 'Fuseau horaire',
 		'Select your timezone' => 'Choisissez un fuseau horaire',
 		'Shop logo:' => 'Logo de la boutique',
-		'Recommended dimensions:' => 'Dimensions recommandées :',
-		'First name:' => 'Prénom :',
-		'Last name:' => 'Nom :',
-		'E-mail address:' => 'Adresse e-mail :',
-		'Shop password:' => 'Mot de passe :',
-		'Re-type to confirm:' => 'Confirmation du mot de passe :',
+		'Recommended dimensions:' => 'Dimensions recommandées',
+		'First name' => 'Prénom',
+		'Last name' => 'Nom',
+		'E-mail address' => 'Adresse e-mail',
+		'Shop password' => 'Mot de passe',
+		'Re-type to confirm' => 'Confirmation du mot de passe',
 		'Receive this information by e-mail' => 'Recevez ces informations par e-mail',
 		'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Attention : vous ne recevrez ces informations que si votre configuration des e-mails est correcte',
-		'Configure your database by filling out the following fields:' => 'Configurez la connexion à votre base de données en remplissant les champs suivants.',
+		'Configure your database by filling out the following fields' => 'Configurez la connexion à votre base de données en remplissant les champs suivants.',
 		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => 'Vous devez créer une base de données, de l\'aide est disponible sur <a href="http://doc.prestashop.com/display/PS15/Installer+PrestaShop#InstallerPrestaShop-Cr%C3%A9erunebasededonn%C3%A9espourvotreboutique" target="_blank">notre documentation en ligne</a>.',
-		'Database server address:' => 'Adresse du serveur de la base :',
+		'Database server address' => 'Adresse du serveur de la base',
 		'If you want to use a different port, add :XX after your server address where XX is your port number.' => 'Si vous souhaitez utiliser un port différent, ajoutez :XX à l\'adresse de votre serveur, XX étant le numéro de votre port.',
-		'Database name:' => 'Nom de la base :',
-		'Database login:' => 'Identifiant de la base :',
-		'Database password:' => 'Mot de passe de la base :',
-		'Database Engine:' => 'Type de base :',
-		'Tables prefix:' => 'Préfixe des tables :',
-		'Drop existing tables (mode dev):' => 'Supprimer les tables (mode dev) :',
+		'Database name' => 'Nom de la base',
+		'Database login' => 'Identifiant de la base',
+		'Database password' => 'Mot de passe de la base',
+		'Database Engine:' => 'Type de base',
+		'Tables prefix' => 'Préfixe des tables',
+		'Drop existing tables (mode dev)' => 'Supprimer les tables (mode dev)',
 		'Verify now!' => 'Vérifier maintenant !',
 		'E-mail delivery set-up' => 'Configuration de l\'envoi des e-mails',
 		'Configure SMTP manually (advanced users only)' => 'Configurer le serveur SMTP (mode expert)',
 		'By default, the PHP mail() function is used' => 'Par défaut la fonction PHP mail() est utilisée',
 		'SMTP server address:' => 'Adresse du serveur SMTP',
-		'Encryption:' => 'Cryptage :',
+		'Encryption:' => 'Cryptage',
 		'None' => 'Aucun',
-		'Port:' => 'Port :',
-		'Login:' => 'Identifiant :',
-		'Password:' => 'Mot de passe :',
+		'Port:' => 'Port',
+		'Login:' => 'Identifiant',
+		'Password' => 'Mot de passe',
 		'enter@your.email' => 'entrez@votre.email',
 		'Send me a test email!' => 'Envoyez moi un e-mail de test !',
 		'Next' => 'Suivant',
@@ -136,7 +136,7 @@ return array(
 		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'Vous pouvez utiliser les liens à gauche pour revenir aux étapes précédentes, ou redémarrer l\'installation en <a href="%s">cliquant ici</a>.',
 		'Your installation is finished!' => 'L\'installation est finie !',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => 'Vous venez d’installer votre boutique en ligne, merci d\'avoir choisi PrestaShop !',
-		'Please remember your login information:' => 'Merci de conserver les informations de connexion suivantes :',
+		'Please remember your login information' => 'Merci de conserver les informations de connexion suivantes',
 		'WARNING: For security purposes, you must delete the "install" folder.' => 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\'.',
 		'Back Office' => 'Administration',
 		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'Accédez dès à présent à votre interface de gestion pour commencer la configuration de votre boutique.',
@@ -146,10 +146,10 @@ return array(
 		'Discover your store' => 'Découvrez votre boutique',
 		'Required set-up. Please verify the following checklist items are true.' => 'Merci de vous assurer que chacun des paramètres ci-dessous est valide (coche verte affichée).',
 		'Your configuration is valid, click next to continue!' => 'Votre configuration est valide, vous pouvez continuer l\'installation !',
-		'Your configuration is invalid. Please fix the issues below:' => 'Votre configuration est invalide. Merci de corriger les problèmes ci dessous :',
+		'Your configuration is invalid. Please fix the issues below:' => 'Votre configuration est invalide. Merci de corriger les problèmes ci dessous',
 		'Optional set-up' => 'Paramètres optionnels',
 		'Refresh these settings' => 'Rafraîchir ces informations',
-		'Welcome to the PrestaShop %s Installer.' => 'Bienvenue sur l\'installation de PrestaShop %s',
+		'Welcome to the PrestaShop %s Installer' => 'Bienvenue sur l\'installation de PrestaShop %s',
 		'The installation process should take only few minutes!' => 'Le processus d\'installation devrait vous prendre quelques minutes seulement !',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Si vous avez besoin d\'aide, n\'hésitez pas à visiter <a href="%1$s" target="_blank">notre documentation</a> ou à contacter notre équipe de support : %2$s',
 		'Did you know?' => 'Le saviez vous ?',
@@ -203,14 +203,14 @@ return array(
 		'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Afin de profiter gratuitement des nombreuses fonctionnalités qu\'offre PrestaShop, merci de prendre connaissance des termes des licences ci-dessous. Le coeur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.',
 		'PrestaShop Installation Assistant' => 'Assistant d\'installation',
 		'Contact us!' => 'Contactez-nous !',
-		'E-mail:' => 'E-mail :',
+		'E-mail' => 'E-mail',
 		'Print my login information' => 'Imprimer cette page',
 		'We are currently checking PrestaShop compatibility with your system environment' => 'Nous vérifions en ce moment la compatibilité de PrestaShop avec votre système',
 		'PrestaShop compatibility with your system environment has been verified!' => 'La compatibilité de PrestaShop avec votre système a été vérifiée',
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => 'Merci de bien vouloir corriger le(s) point(s) ci-dessous puis de cliquer sur le bouton "Rafraichir ces informations" afin de tester à nouveau la compatibilité de votre système.',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop nécessite au moins 32Mo de mémoire pour fonctionner, merci de vérifier la valeur de la directive memory_limit dans votre fichier php.ini ou de contacter votre hébergeur.',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'L\'installation de PrestaShop est simple et rapide. En quelques minutes seulement, vous rejoindrez une communauté de plus de 150 000 marchands pour créer une boutique en ligne à votre image et la gérer facilement au quotidien.',
-		'Continue the installation in:' => 'Continuer l\'installation en :',
+		'Continue the installation in' => 'Continuer l\'installation en',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'Le choix de la langue ci-dessus s\'applique à l\'assistant d\'installation. Une fois votre boutique installée, vous pourrez choisir la langue de votre boutique parmi plus de %d traductions disponibles gratuitement !',
 		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Pour utiliser PrestaShop, vous devez <a href="http://doc.prestashop.com/display/PS15/Installer+PrestaShop" target="_blank">créer une base de données</a> afin de rassembler l\'ensemble des données liées à l\'activité de votre boutique.',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Merci de renseigner ci-dessous les informations requises pour que PrestaShop puisse se connecter à votre base de données.',
@@ -242,13 +242,15 @@ return array(
 		'Your PHP sessions path is not writable - check with your hosting provider:' => 'Le dossier de stockage n\'est pas accessible en écriture - consultez votre hébergeur',
 		'Database is created' => 'Base de données créée',
 		'Cannot create the database automatically' => 'Impossible de créer la base de données automatiquement',
-		'Install modules Addons' => 'Installation des modules Addons',
+		'Install Addons modules' => 'Installation des modules Addons',
 		'Attempt to create the database automatically' => 'Essayer de créer la base de données automatiquement',
-		'Country:' => 'Pays :',
+		'Country' => 'Pays',
 		'Must be letters and numbers with at least 8 characters' => 'Lettres et chiffres avec au moins 8 caractères',
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Pour installer PrestaShop, vous devez avoir JavaScript activé dans votre navigateur',
 		'For security purposes, you must delete the "install" folder.' => 'Pour des raisons de sécurité, vous devez supprimer le dossier "install" manuellement.',
 		'Files' => 'Fichiers',
 		'All files are not successfuly uploaded on your server' => 'Tous les fichiers n\'ont pas été correctement téléchargés sur votre serveur',
+		'Must be at least 8 characters' => 'Minimum 8 caractères',
+		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installer+PrestaShop#InstallerPrestaShop-Terminerl%27installation',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/id/install.php b/install-dev/langs/id/install.php
index 180621db6..f5c9c5fae 100644
--- a/install-dev/langs/id/install.php
+++ b/install-dev/langs/id/install.php
@@ -15,7 +15,7 @@ return array(
 		'menu_database' => 'Konfigurasi sistem',
 		'menu_configure' => 'Informasi toko',
 		'menu_process' => 'Instalasi toko',
-		'Choose the installer language:' => 'Pilih bahasa :',
+		'Choose the installer language:' => 'Pilih bahasa',
 		'Field required' => 'Harus diisi',
 		'Invalid shop name' => 'Nama toko tidak valid',
 		'Your firstname contains some invalid characters' => 'Nama depan Anda berisi karakter yang tidak diperbolehkan',
@@ -68,13 +68,13 @@ return array(
 		'Install demonstration data' => 'Install data untuk demo',
 		'Install theme' => 'Install theme',
 		'Send information e-mail' => 'Kirim informasi e-mail',
-		'PHP parameters:' => 'Parameter PHP :',
+		'PHP parameters:' => 'Parameter PHP',
 		'Is PHP 5.1.2 or later installed ?' => 'Apakah PHP 5.1.2 atau lebih baru terinstall ?',
 		'Can upload files ?' => 'Dapat mengupload file ?',
 		'Can create new files and folders ?' => 'Dapat membuat file dan folder ?',
 		'Is GD Library installed ?' => 'Apakah library GD terinstall ?',
 		'Is MySQL support is on ?' => 'Apakah mendukung MySQL ?',
-		'Recursive write permissions on files and folders:' => 'Hak akses rekursif untuk file dan folder:',
+		'Recursive write permissions on files and folders:' => 'Hak akses rekursif untuk file dan folder',
 		'Can open external URLs ?' => 'Dapat membuka URL eksternal ?',
 		'Is PHP register global option off (recommended) ?' => 'Opsi PHP register global dinon-aktifkan (disarankan) ?',
 		'Is GZIP compression activated (recommended) ?' => 'Kompresi GZIP aktif (disarankan) ?',
@@ -83,48 +83,48 @@ return array(
 		'Is Dom extension loaded ?' => 'Apakah ekstensi DOM terpasang ?',
 		'Is PDO MySQL extension loaded ?' => 'Apakah PDO MySQL terpasang ?',
 		'Shop settings and merchant account information' => 'Seting toko dan akun',
-		'Shop name:' => 'Nama toko :',
-		'Main activity:' => 'Kegiatan :',
+		'Shop name' => 'Nama toko',
+		'Main activity' => 'Kegiatan',
 		'Please choose your main activity' => 'Harap pilih kegiatan utama toko ini',
 		'Other activity...' => 'Kegiatan lainnya...',
 		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'Informasi ini tidak harus diisi, hanya untuk keperluan statistik dan tidak ada pengaruh apapun ke toko Anda.',
-		'Install demo products:' => 'Install produk demo :',
+		'Install demo products' => 'Install produk demo',
 		'Yes' => 'Ya',
 		'No' => 'Tidak',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Demo produk diperlukan jika Anda ingin belajar cara menggunakan PrestaShop. Disarankan untuk diinstall jika Anda masih belum terbiasa dengan Prestashop.',
-		'Default country:' => 'Negara :',
+		'Default country:' => 'Negara',
 		'Select your country' => 'Pilih negara Anda',
-		'Shop timezone:' => 'Zona waktu :',
+		'Shop timezone:' => 'Zona waktu',
 		'Select your timezone' => 'Pilih zona waktu',
 		'Shop logo:' => 'Logo',
-		'Recommended dimensions:' => 'Dimensi yang direkomendasikan :',
-		'First name:' => 'Nama depan :',
-		'Last name:' => 'Nama belakang :',
-		'E-mail address:' => 'Alamat e-mail :',
-		'Shop password:' => 'Password toko :',
-		'Re-type to confirm:' => 'Tulis ulang password untuk konfirmasi&nbsp;:',
+		'Recommended dimensions:' => 'Dimensi yang direkomendasikan',
+		'First name' => 'Nama depan',
+		'Last name' => 'Nama belakang',
+		'E-mail address' => 'Alamat e-mail',
+		'Shop password' => 'Password toko',
+		'Re-type to confirm' => 'Tulis ulang password untuk konfirmasi&nbsp;',
 		'Receive this information by e-mail' => 'Kirim informasi ini melalui e-mail',
 		'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Perhatian: Anda akan menerima informasi ini jika konfigurasi e-mail Anda benar.',
-		'Configure your database by filling out the following fields:' => 'Konfigurasi database Anda dengan mengisi field berikut ini :',
+		'Configure your database by filling out the following fields' => 'Konfigurasi database Anda dengan mengisi field berikut ini',
 		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => 'Anda harus membuat database, panduan tersedia di <a href="http://doc.prestashop.com" target="_blank">dokumentasi online Prestashop</a>.',
-		'Database server address:' => 'Alamat server database :',
+		'Database server address' => 'Alamat server database',
 		'If you want to use a different port, add :XX after your server address where XX is your port number.' => 'Jika Anda ingin menggunakan port yang berbeda, tambahkan :XX setelah alamat server dimana XX adalah nomor port yang Anda gunakan.',
-		'Database name:' => 'Nama database :',
-		'Database login:' => 'User database :',
-		'Database password:' => 'Password database  :',
-		'Database Engine:' => 'Engine database :',
-		'Tables prefix:' => 'Prefix nama tabel :',
-		'Drop existing tables (mode dev):' => 'Hapus tabel yang ada (dev mode) :',
+		'Database name' => 'Nama database',
+		'Database login' => 'User database',
+		'Database password' => 'Password database',
+		'Database Engine:' => 'Engine database',
+		'Tables prefix' => 'Prefix nama tabel',
+		'Drop existing tables (mode dev)' => 'Hapus tabel yang ada (dev mode)',
 		'Verify now!' => 'Cek sekarang !',
 		'E-mail delivery set-up' => 'Setup e-mail',
 		'Configure SMTP manually (advanced users only)' => 'Konfigurasikan SMTP server secara manual (untuk pengguna ahli)',
 		'By default, the PHP mail() function is used' => 'Secara default, fungsi PHP mail() yang digunakan',
 		'SMTP server address:' => 'Alamat server SMTP',
-		'Encryption:' => 'Enkripsi :',
+		'Encryption:' => 'Enkripsi',
 		'None' => '-',
-		'Port:' => 'Port :',
-		'Login:' => 'Login :',
-		'Password:' => 'Password :',
+		'Port:' => 'Port',
+		'Login:' => 'Login',
+		'Password' => 'Password',
 		'enter@your.email' => 'alamat@email.anda',
 		'Send me a test email!' => 'Kirim tes email !',
 		'Next' => 'Lanjutkan',
@@ -140,7 +140,7 @@ return array(
 		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'Anda dapat menggunakan tautan yang ada di kolom sebelah kiri untuk kembali ke langkah sebelumnya the, atau mengulang proses instalasi dengan <a href="%s">klik tautan ini</a>.',
 		'Your installation is finished!' => 'Proses instalasi selesai !',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => 'Proses instalasi berhasil dan selesai. Terima kasih telah menggunakan PrestaShop !',
-		'Please remember your login information:' => 'Harap ingat informasi login Anda berikut ini :',
+		'Please remember your login information' => 'Harap ingat informasi login Anda berikut ini',
 		'WARNING: For security purposes, you must delete the "install" folder.' => 'PERHATIAN: Untuk keamanan, Anda harus menghapus folder "install".',
 		'Back Office' => 'Back Office',
 		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'Kelola toko Anda melalui backoffice, dimana Anda dapat mengatur order, pelanggan, memasang modul, merubah theme dan banyak lagi.., ',
@@ -150,10 +150,10 @@ return array(
 		'Discover your store' => 'Kunjungi website Anda',
 		'Required set-up. Please verify the following checklist items are true.' => 'Harus diseting! Harap pastikan daftar ceklist berikut ini valid.',
 		'Your configuration is valid, click next to continue!' => 'Konfigurasi Anda sudah benar, silahkan klik tombol lanjutkan !',
-		'Your configuration is invalid. Please fix the issues below:' => 'Konfigurasi tidak benar. Harap perbaiki permasalahan berikut ini:',
+		'Your configuration is invalid. Please fix the issues below:' => 'Konfigurasi tidak benar. Harap perbaiki permasalahan berikut ini',
 		'Optional set-up' => 'Seting opsional',
 		'Refresh these settings' => 'Refresh setting',
-		'Welcome to the PrestaShop %s Installer.' => 'Selamat datang di instalasi Prestashop %s',
+		'Welcome to the PrestaShop %s Installer' => 'Selamat datang di instalasi Prestashop %s',
 		'The installation process should take only few minutes!' => 'Proses instalasi hanya memerlukan waktu beberapa menit saja!',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Jika memerlukan bantuan, jangan ragu untuk membaca <a href="%1$s" target="_blank">dokumentasi</a> atau hubungi tim kami di : %2$s',
 		'Did you know?' => 'Tahukah Anda ?',
@@ -216,7 +216,7 @@ return array(
 		'PrestaShop compatibility with your system environment has been verified!' => 'Kompabilitas Prestashop dengan sistem Anda berhasil diverifikasi!',
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => 'Oops! Harap perbaiki item-item dibawah terlebih dahulu, lalu klik tombol "Refresh" untuk tes ulang kompabilitas sistem Anda.',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 130,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'Proses instalasi PrestaShop cepat dan mudah. Dalam beberapa saat lagi, Anda akan menjadi bagian dari komunitas aktif yang terdiri dari 130.000 toko online. Andapun akan membuat toko online unik untuk Anda sendiri yang dapat dikelola dengan mudah.',
-		'Continue the installation in:' => 'Lanjutkan instalasi dalam bahasa:',
+		'Continue the installation in' => 'Lanjutkan instalasi dalam bahasa',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'Pilihan bahasa diatas hanya berlaku ketika proses instalasi. Setelah terinstall, Anda dapat memilih bahasa untuk toko Anda dari lebih %d bahasa yang tersedia secara gratis!',
 		'The field %s is limited to %d characters' => 'Field %s dibayasi hanya %d karakter',
 		'An error occurred during logo copy.' => 'Eror ketika menyalin logo',
@@ -238,14 +238,14 @@ return array(
 		'Sign-up to the newsletter' => 'Berlangganan newsletter',
 		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => 'Jika memerlukan bantuan selama proses instalasi, hubungi tim kami di %s dan satu dari tim ahli kami dengan senang hati akan membantu Anda.',
 		'Contact us!' => 'Hubungi kami!',
-		'E-mail:' => 'E-mail:',
+		'E-mail' => 'E-mail',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop membutuhkan memori sedikitnya 32M, harap cek direktif memory_limit di php.ini atau hubungi tempat hosting Anda',
 		'Your PHP sessions path is not writable - check with your hosting provider:' => 'PHP sessions path tidak dapat ditulisi - cek ke tempat hosting Anda',
 		'Database is created' => 'Database berhasil dibuat',
 		'Cannot create the database automatically' => 'Tidak dapat membuat database secara otomatis',
-		'Install modules Addons' => 'Install modul Addons',
+		'Install Addons modules' => 'Install modul Addons',
 		'Attempt to create the database automatically' => 'Mencoba membuat database secara otomatis',
-		'Country:' => 'Negara :',
+		'Country' => 'Negara',
 		'Must be letters and numbers with at least 8 characters' => 'Harus huruf atau angka minimum 8 karakter',
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Untuk proses instalasi Prestashop, Javascript di browser Anda harus aktif.',
 		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
@@ -255,5 +255,6 @@ return array(
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'Proses instalasi PrestaShop cepat dan mudah. Dalam beberapa saat lagi, Anda akan menjadi bagian dari komunitas aktif yang terdiri dari 130.000 toko online. Andapun akan membuat toko online unik untuk Anda sendiri yang dapat dikelola dengan mudah.',
 		'Files' => 'File',
 		'All files are not successfuly uploaded on your server' => 'Tidak semua file berhasil diunggah ke server',
+		'Must be at least 8 characters' => 'Min. 8 karakter',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php
index ac4e5c6c7..9ce53f87d 100644
--- a/install-dev/langs/it/install.php
+++ b/install-dev/langs/it/install.php
@@ -2,8 +2,8 @@
 return array(
 	'informations' => array(
 		'phone' => '+33 (0)1.40.18.30.04',
-        'support' => 'https://www.prestashop.com/it/support',
-        'blog' => 'http://www.prestashop.com/blog/it/'
+		'support' => 'https://www.prestashop.com/it/support',
+		'blog' => 'http://www.prestashop.com/blog/it/',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Scelta della lingua',
@@ -62,7 +62,7 @@ return array(
 		'Install modules' => 'Installazione moduli',
 		'Install demonstration data' => 'Installazione dati dimostrativi',
 		'Install theme' => 'Installazione del tema',
-		'PHP parameters:' => 'Parametri PHP:',
+		'PHP parameters:' => 'Parametri PHP',
 		'Is PHP 5.1.2 or later installed ?' => 'PHP 5.1.2 o successivi installato?',
 		'Can upload files ?' => 'Posso caricare files?',
 		'Can create new files and folders ?' => 'Posso creare nuovi file e cartelle?',
@@ -77,48 +77,48 @@ return array(
 		'Is Dom extension loaded ?' => 'Estensione Dom è caricata?',
 		'Is PDO MySQL extension loaded ?' => 'Estensione PDO MySQL è caricata?',
 		'Shop settings and merchant account information' => 'Informazioni sul venditore',
-		'Shop name:' => 'Nome del negozio:',
-		'Main activity:' => 'Attività principale:',
+		'Shop name' => 'Nome del negozio',
+		'Main activity' => 'Attività principale',
 		'Please choose your main activity' => 'Seleziona l\'attività principale',
 		'Other activity...' => 'Altre attività...',
 		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'Queste informazioni non sono obbligatorie, saranno utilizzate a fini statistici. Queste informazioni non cambieranno nulla nel tuo negozio.',
-		'Install demo products:' => 'Installazione prodotti dimostrativi:',
+		'Install demo products' => 'Installazione prodotti dimostrativi',
 		'Yes' => 'Sì',
 		'No' => 'No',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'I prodotti dimostrativi sono un buon modo per imparare a utilizzare PrestaShop. Dovresti installarli se non hai ancora dimestichezza con la piattaforma.',
-		'Default country:' => 'Paese di default:',
+		'Default country:' => 'Paese di default',
 		'Select your country' => 'Seleziona il tuo paese',
-		'Shop timezone:' => 'Fuso orario del negozio:',
+		'Shop timezone:' => 'Fuso orario del negozio',
 		'Select your timezone' => 'Seleziona il tuo fuso orario',
-		'Shop logo:' => 'Logo del negozio:',
-		'Recommended dimensions:' => 'Dimensioni suggerite:',
-		'First name:' => 'Nome:',
-		'Last name:' => 'Cognome:',
-		'E-mail address:' => 'Indirizzo email:',
-		'Shop password:' => 'Password del negozio:',
-		'Re-type to confirm:' => 'Digita nuovamente la password:',
+		'Shop logo:' => 'Logo del negozio',
+		'Recommended dimensions:' => 'Dimensioni suggerite',
+		'First name' => 'Nome',
+		'Last name' => 'Cognome',
+		'E-mail address' => 'Indirizzo email',
+		'Shop password' => 'Password del negozio',
+		'Re-type to confirm' => 'Digita nuovamente la password',
 		'Receive this information by e-mail' => 'Riceverò le mie informazioni tramite e-mail',
 		'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Attenzione: riceverai queste informazioni per email solo le la configurazione è corretta',
-		'Configure your database by filling out the following fields:' => 'Configura il database compilando i campi sottostanti:',
+		'Configure your database by filling out the following fields' => 'Configura il database compilando i campi sottostanti',
 		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => 'Devi creare un database, puoi trovare aiuto  <a href="http://doc.prestashop.com" target="_blank">nella nostra documentazione online</a>.',
-		'Database server address:' => 'Indirizzo server del database:',
+		'Database server address' => 'Indirizzo server del database',
 		'If you want to use a different port, add :XX after your server address where XX is your port number.' => 'Se vuoi utilizzare una porta differente aggiungi :XX dopo il tuo indirizzo dove XX è il numero della porta',
-		'Database name:' => 'Nome del database:',
-		'Database login:' => 'Nome di accesso database:',
-		'Database password:' => 'Password del database:',
-		'Database Engine:' => 'Motore del database:',
-		'Tables prefix:' => 'Prefisso delle tabelle:',
-		'Drop existing tables (mode dev):' => 'Cancella le tabelle esistenti (modalità dev):',
+		'Database name' => 'Nome del database',
+		'Database login' => 'Nome di accesso database',
+		'Database password' => 'Password del database',
+		'Database Engine:' => 'Motore del database',
+		'Tables prefix' => 'Prefisso delle tabelle',
+		'Drop existing tables (mode dev)' => 'Cancella le tabelle esistenti (modalità dev)',
 		'Verify now!' => 'Controlla ora!',
 		'E-mail delivery set-up' => 'Impostazioni invio e-mail',
 		'Configure SMTP manually (advanced users only)' => 'Configura il server SMTP manualmente (solo per utenti esperti)',
 		'By default, the PHP mail() function is used' => 'La funzione PHP mail() è utilizzata per default',
-		'SMTP server address:' => 'Indirizzo server SMTP:',
-		'Encryption:' => 'Crittografia:',
+		'SMTP server address:' => 'Indirizzo server SMTP',
+		'Encryption:' => 'Crittografia',
 		'None' => 'Nessuno',
-		'Port:' => 'Porta:',
-		'Login:' => 'Nome:',
-		'Password:' => 'Password:',
+		'Port:' => 'Porta',
+		'Login:' => 'Nome',
+		'Password' => 'Password',
 		'enter@your.email' => 'inserisci@la.tua.email',
 		'Send me a test email!' => 'Inviami un\'email di prova!',
 		'Next' => 'Avanti',
@@ -134,7 +134,7 @@ return array(
 		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'Puoi usare i link sulla colonna di sinistra per tornare indietro alle fasi precedenti, oppure puoi riavviare il processo di installazione <a href="%s">cliccando qui</a>.',
 		'Your installation is finished!' => 'Installazione conclusa!',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => 'Il tuo negozio è stato installato correttamente. Grazie per aver scelto PrestaShop!',
-		'Please remember your login information:' => 'Ricorda le credenziali per il login:',
+		'Please remember your login information' => 'Ricorda le credenziali per il login',
 		'WARNING: For security purposes, you must delete the "install" folder.' => 'ATTENZIONE: per motivi di sicurezza, devi cancellare la cartella \'install\'.',
 		'Back Office' => 'Back Office',
 		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => 'Gestisci il tuo negozio tramite il Back Office. Gestisci ordini e clienti, aggiungi moduli, modifica i temi, ecc.',
@@ -144,10 +144,10 @@ return array(
 		'Discover your store' => 'Scopri il negozio',
 		'Required set-up. Please verify the following checklist items are true.' => 'Impostazioni obbligatorie. Per favore verifica che la lista sia ok',
 		'Your configuration is valid, click next to continue!' => 'La tua configurazione è valida, clicca su avanti per continuare',
-		'Your configuration is invalid. Please fix the issues below:' => 'La tua configurazione non è valida,<br />correggi questi problemi:',
+		'Your configuration is invalid. Please fix the issues below:' => 'La tua configurazione non è valida,<br />correggi questi problemi',
 		'Optional set-up' => 'Parametri opzionali',
 		'Refresh these settings' => 'Aggiorna le impostazioni',
-		'Welcome to the PrestaShop %s Installer.' => 'Benvenuto nell\'Assistente di Installazione di PrestaShop %s .',
+		'Welcome to the PrestaShop %s Installer' => 'Benvenuto nell\'Assistente di Installazione di PrestaShop %s',
 		'The installation process should take only few minutes!' => 'Il processo di installazione dovrebbe durare solo pochi minuti!',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Se hai bisogno di aiuto, consulta <a href="%1$s" target="_blank">la nostra documentazione</a> oppure contatta il nostro servizio di assistenza: %2$s',
 		'Did you know?' => 'Lo sapevi?',
@@ -204,7 +204,7 @@ return array(
 		'Cannot create new files and folders' => 'Impossibile creare nuovi file e cartelle',
 		'GD Library is not installed' => 'La libreria GD non è installata',
 		'MySQL support is not activated' => 'Il supporto MySQL non è attivo',
-		'Recursive write permissions on files and folders:' => 'Permessi di scrittura ricorsivi su file e cartelle:',
+		'Recursive write permissions on files and folders:' => 'Permessi di scrittura ricorsivi su file e cartelle',
 		'Cannot open external URLs' => 'Impossibile aprire URL esterne',
 		'PHP register global option is on' => 'L\'opzione PHP register global è attiva',
 		'GZIP compression is not activated' => 'La compressione GZIP non è attiva',
@@ -225,7 +225,7 @@ return array(
 		'Contact us!' => 'Contattaci!',
 		'Installation Assistant' => 'Assistente di Installazione',
 		'To enjoy the many features that are offered by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Per usufruire delle numerose funzioni offerte da PrestaShop, leggi i termini e le condizioni dei contratti di licenza. Il core di PrestaShop è pubblicato sotto licenza OSL 3.0, mentre i moduli e i temi sotto licenza AFL 3.0. ',
-		'E-mail:' => 'Email:',
+		'E-mail' => 'Email',
 		'Print my login information' => 'Stampa le credenziali per il login',
 		'Display' => 'Visualizza',
 		'We are currently checking PrestaShop compatibility with your system environment' => 'Stiamo verificando la compatibilità di PrestaShop con il tuo sistema',
@@ -233,17 +233,22 @@ return array(
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => 'Ops! Correggi i seguenti punti, quindi clicca sul pulsante "Aggiorna" per verificare la compatibilità di PrestaShop del tuo nuovo sistema.',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'L\'esecuzione di PrestaShop necessita di almeno 32M di memoria. Controlla la voce memory_limit nel file php.ini o contatta il tuo fornitore di hosting',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'L\'installazione di PrestaShop è semplice e veloce. In pochi minuti, farai parte di una comunità di oltre 150.000 commercianti. Potrai creare un negozio unico a tuo piacere, facile da gestire giorno dopo giorno.',
-		'Continue the installation in:' => 'Continua l\'installazione in:',
+		'Continue the installation in' => 'Continua l\'installazione in',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'La selezione della lingua qui sopra è valida solamente nell\'Assistente di Installazione. Una volta che il negozio è installato, potrai scegliere la lingua del negozio tra le oltre %d  traduzioni disponibili gratuitamente!',
 		'Your PHP sessions path is not writable - check with your hosting provider:' => 'La cartella di backup non è accessibile per scrittura - consulta il nostro servizio di hosting',
 		'Database is created' => 'Il database è creato',
 		'Cannot create the database automatically' => 'Non è possibile creare il database automaticamente',
-		'Install modules Addons' => 'Installazione moduli Addons',
+		'Install Addons modules' => 'Installazione moduli Addons',
 		'Attempt to create the database automatically' => 'Tentativo di creare il database automaticamente',
-		'Country:' => 'Paese:',
+		'Country' => 'Paese',
 		'Must be letters and numbers with at least 8 characters' => 'Deve contenere lettere e numeri ed essere composta da almeno 8 caratteri',
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Per installare PrestaShop, devi avere JavaScript abilitato nel tuo browser.',
 		'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Per godere delle svariate funzioni che PrestaShop offre gratuitamente, si prega di leggere le condizioni di licenza qui di seguito. Il nucleo di PrestaShop è rilasciato sotto licenza OSL 3.0, mentre i moduli e i temi sono rilasciati sotto licenza AFL 3.0.',
 		'For security purposes, you must delete the "install" folder.' => 'Per motivi di sicurezza, devi cancellare la cartella "install".',
+		'Files' => 'Files',
+		'Must be at least 8 characters' => 'Minimo 8 caratteri',
+		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
+		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
+		'All files are not successfuly uploaded on your server' => 'Siamo spiacenti il Suo hosting non ha potuto aggiornare tutti i files con successo',
 	),
-);
+);
\ No newline at end of file
diff --git a/install-dev/langs/nl/install.php b/install-dev/langs/nl/install.php
index 62e59d74e..f69c88957 100644
--- a/install-dev/langs/nl/install.php
+++ b/install-dev/langs/nl/install.php
@@ -15,10 +15,10 @@ return array(
 		'menu_database' => 'Systeemconfiguratie',
 		'menu_configure' => 'Winkel informatie',
 		'menu_process' => 'Winkel installatie',
-		'Welcome to the PrestaShop %s Installer.' => 'Welkom bij het PrestaShop %s installatieprogramma.',
+		'Welcome to the PrestaShop %s Installer' => 'Welkom bij het PrestaShop %s installatieprogramma',
 		'PrestaShop Installation Assistant' => 'PrestaShop Installatie Assistent',
 		'Installation Assistant' => 'Installatie Assistent',
-		'Continue the installation in:' => 'Ga verder met de installatie in:',
+		'Continue the installation in' => 'Ga verder met de installatie in',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'De installatie van PrestaShop is snel en eenvoudig. Binnen enkele minuten maakt u deel uit van een community met meer dan 150.000 handelaren. U staat op het punt om uw eigen unieke webwinkel te maken, die u dagelijks eenvoudig kunt beheren.',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Als u hulp nodig hebt, lees onze documentatie door of neem contact op met onze support team: %2$s',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'De talenselectie hierboven geldt alleen voor de installatie assistent. Zodra uw webwinkel is geïnstalleerd, kunt u geheel gratis de taal voor uw webwinkel uit meer dan %d vertalingen kiezen.',
@@ -27,9 +27,9 @@ return array(
 		'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Om van de vele functies, die door PrestaShop gratis worden aangebonden, gebruik te maken, lees dan de onderstaande licentievoorwaarden. De PrestaShop-kern is onder OSL 3.0 gelicenseerd, terwijl de modules en thema\'s onder AFL 3.0 zijn gelicenseerd.',
 		'I agree to the above terms and conditions.' => 'Ik ga akkoord met de bovenstaande voorwaarden.',
 		'Information about your Store' => 'Informatie over uw webwinkel',
-		'Shop name:' => 'Winkelnaam:',
-		'Main activity:' => 'Hoofdactiviteit:',
-		'Please choose your main activity' => 'Selecteer uw hoofdactiviteit:',
+		'Shop name' => 'Winkelnaam',
+		'Main activity' => 'Hoofdactiviteit',
+		'Please choose your main activity' => 'Selecteer uw hoofdactiviteit',
 		'Animals and Pets' => 'Huisdieren',
 		'Art and Culture' => 'Kunst en cultuur',
 		'Babies' => 'Baby\'s',
@@ -56,17 +56,17 @@ return array(
 		'Field required' => 'Verplicht veld',
 		'Invalid shop name' => 'Ongeldige winkelnaam',
 		'This e-mail address is invalid' => 'Dit e-mailadres is ongeldig',
-		'Country:' => 'Land:',
+		'Country' => 'Land',
 		'Select your country' => 'Selecteer uw land',
 		'Your Account' => 'Uw account',
-		'First name:' => 'Voornaam:',
-		'Last name:' => 'Achternaam:',
-		'E-mail address:' => 'E-mailadres:',
-		'Shop password:' => 'Wachtwoord:',
+		'First name' => 'Voornaam',
+		'Last name' => 'Achternaam',
+		'E-mail address' => 'E-mailadres',
+		'Shop password' => 'Wachtwoord',
 		'Must be letters and numbers with at least 8 characters' => 'Moet tenminste uit 8 letters en nummers bestaan',
-		'Re-type to confirm:' => 'Bevestig wachtwoord:',
+		'Re-type to confirm' => 'Bevestig wachtwoord',
 		'Sign-up to the newsletter' => 'Aanmelden voor de nieuwbrief',
-		'Install demo products:' => 'Installeer demo producten:',
+		'Install demo products' => 'Installeer demo producten',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Demo producten zijn een goede manier om te ontdekken hoe PrestaShop werkt. Installeer deze als u er nog niet bekend mee bent.',
 		'This email address will be your username to access your store\'s back office.' => 'Dit e-mailadres is uw backoffice gebruikersnaam.',
 		'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'PrestaShop kan op regelmatige basis tips naar u toesturen over hoe u het beheer van uw winkel kunt verbeteren wat u tevens zult helpen om uw bedrijf te laten groeien. Indien u niet wenst om deze tips te ontvangen, vink dit vakje dan uit.',
@@ -78,34 +78,34 @@ return array(
 		'The password is incorrect (alphanumeric string with at least 8 characters)' => 'Het wachtwoord is onjuist (alfanumerieke reeks met tenministe 8 karakters)',
 		'Password and its confirmation are different' => 'Wachtwoord en de bevestiging zijn verschillend',
 		'Other activity...' => 'Andere activiteit',
-		'Configure your database by filling out the following fields:' => 'Configureer uw database door de volgende velden in te vullen:',
+		'Configure your database by filling out the following fields' => 'Configureer uw database door de volgende velden in te vullen',
 		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Om PrestaShop te gebruiken, moet u <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">een database maken</a> om alle data-gerelateerde activiteiten van uw winkel te verzamelen',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Vul de onderstaande velden in, zodat PrestaShop een verbinding kan maken met uw database.',
-		'Database server address:' => 'Database serveradres:',
+		'Database server address' => 'Database serveradres',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'De standaardpoort is 3306. Om een andere poort te gebruiken, voeg het poortnummer aan het einde van uw serveradres toe, bijv. ":4242".',
-		'Database name:' => 'Database naam:',
-		'Database login:' => 'Database login:',
-		'Database password:' => 'Database wachtwoord:',
-		'Tables prefix:' => 'Tabellen prefix:',
+		'Database name' => 'Database naam',
+		'Database login' => 'Database login',
+		'Database password' => 'Database wachtwoord',
+		'Tables prefix' => 'Tabellen prefix',
 		'Test your database connection now!' => 'Test uw databaseverbinding nu!',
 		'None' => 'Geen',
-		'Port:' => 'Poort:',
-		'Login:' => 'Login:',
+		'Port:' => 'Poort',
+		'Login:' => 'Login',
 		'enter@your.email' => 'enter@your.email',
 		'Send me a test email!' => 'Stuur mij een test e-mail!',
-		'Drop existing tables (mode dev):' => 'Bestaande tabellen verwijderen (mode dev):',
+		'Drop existing tables (mode dev)' => 'Bestaande tabellen verwijderen (mode dev)',
 		'Configure SMTP manually (advanced users only)' => 'Configureer SMTP handmatig (enkel voor geavanceerde gebruikers)',
-		'SMTP server address:' => 'SMTP serveradres:',
+		'SMTP server address:' => 'SMTP serveradres',
 		'Encryption:' => 'Encryptie',
 		'Forum' => 'Forum',
 		'At least one table with same prefix was already found, please change your prefix or drop your database' => 'Tenminste één table met dezelfde prefix is gevonden. Verander uw prefix of verwijder uw database.',
 		'Database Server is not found. Please verify the login, password and server fields' => 'Databaseserver is niet gevonden. Controleer de login-, wachtwoord- en servervelden',
 		'Shop timezone:' => 'Winkel tijdzone',
 		'Select your timezone' => 'Selecteer uw tijdzone',
-		'Shop logo:' => 'Winkel logo:',
+		'Shop logo:' => 'Winkel logo',
 		'Optional - You can add you logo at a later time.' => 'Optioneel - U kunt uw logo later toevoegen',
-		'Password:' => 'Wachtwoord:',
-		'E-mail:' => 'E-mail:',
+		'Password' => 'Wachtwoord',
+		'E-mail' => 'E-mail',
 		'Print my login information' => 'Print mijn login informatie',
 		'Official forum' => 'Officiële forum',
 		'Support' => 'Support',
@@ -113,7 +113,7 @@ return array(
 		'Blog' => 'Blog',
 		'Your installation is finished!' => 'Uw installatie is voltooid!',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => 'U hebt zojuist uw winkel geïnstalleerd. Dank u voor het gebruiken van PrestaShop!',
-		'Please remember your login information:' => 'Gelieve uw login informatie te onthouden:',
+		'Please remember your login information' => 'Gelieve uw login informatie te onthouden',
 		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => 'Een SQL fout is opgetreden voor entiteit <i>%1$s</i>: <i>%2$s</i> ',
 		'%s - Login information' => '%s - Login informatie',
 		'Database is connected' => 'Database is verbonden',
@@ -140,7 +140,7 @@ return array(
 		'Contact us' => 'Contacteer ons',
 		'Contact us!' => 'Contacteer ons!',
 		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript ',
-		'Database Engine:' => 'Database engine:',
+		'Database Engine:' => 'Database engine',
 		'E-mail delivery set-up' => 'E-mailinstellingen',
 		'By default, the PHP mail() function is used' => 'De PHP mail() functie wordt standaard gebruikt',
 		'Image folder %s is not writable' => 'Afbeeldingmap %s is niet schrijfbaar',
@@ -157,16 +157,16 @@ return array(
 		'Populate database tables' => 'Vullen database tabellen',
 		'Configure shop information' => 'Configureren winkelinformatie',
 		'Install modules' => 'Installeren modules',
-		'Install modules Addons' => 'Installeren Addons modules',
+		'Install Addons modules' => 'Installeren Addons modules',
 		'Install demonstration data' => 'Installeren demonstratiegegevens',
 		'Install theme' => 'Installeren thema',
 		'Cannot upload files' => 'Kan bestanden niet uploaden',
 		'Cannot create new files and folders' => 'Kan nieuwe bestanden en mappen niet creëren',
 		'GD Library is not installed' => 'GD Library is niet geïnstalleerd',
-		'PHP parameters:' => 'PHP parameters:',
+		'PHP parameters:' => 'PHP parameters',
 		'PHP 5.1.2 or later is not enabled' => 'PHP 5.1.2 of hoger is niet geactiveerd',
 		'MySQL support is not activated' => 'MySQL support is niet geactiveerd',
-		'Recursive write permissions on files and folders:' => 'Recursieve schrijfrechten op bestanden en mappen:',
+		'Recursive write permissions on files and folders:' => 'Recursieve schrijfrechten op bestanden en mappen',
 		'Cannot open external URLs' => 'Kan externe URLs niet openen',
 		'GZIP compression is not activated' => 'GZIP compressie is niet geactiveerd',
 		'Mcrypt extension is not enabled' => 'Mcrypt extensie is niet geactiveerd',
@@ -198,5 +198,8 @@ return array(
 		'Attempt to create the database automatically' => 'Poging om de database automatisch te creëren',
 		'Fixtures class "%s" not found' => 'Fixtures class "%s" niet gevonden',
 		'PHP register global option is on' => 'PHP register global optie is ingeschakeld',
+		'Must be at least 8 characters' => 'Minimaal 8 karakters',
+		'Files' => 'Bestanden',
+		'All files are not successfuly uploaded on your server' => 'Alle bestanden zijn niet succesvol geüpload naar uw server',
 	),
-);
+);
\ No newline at end of file
diff --git a/install-dev/langs/pl/install.php b/install-dev/langs/pl/install.php
index ba2a0767e..189a02309 100644
--- a/install-dev/langs/pl/install.php
+++ b/install-dev/langs/pl/install.php
@@ -2,8 +2,8 @@
 return array(
 	'informations' => array(
 		'phone' => '+33 (0)1.40.18.30.04',
-        'support' => 'https://www.prestashop.com/pl/wsparcie-techniczne',
-        'blog' => 'http://www.prestashop.com/blog/pl/'
+		'support' => 'https://www.prestashop.com/pl/wsparcie-techniczne',
+		'blog' => 'http://www.prestashop.com/blog/pl/',
 	),
 	'translations' => array(
 		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => 'Wystąpił błąd SQL w rekordzie <i>%1$s</i>: <i>%2$s</i>',
@@ -56,19 +56,19 @@ return array(
 		'Install demonstration data' => 'Stwórz dane (produkty, strony, kategorie) przykładowe',
 		'Install theme' => 'Instalacja Szablonu',
 		'PHP 5.1.2 or later is not enabled' => 'PHP 5.1.2 lub nowszy nie jest włączony',
-		'PHP parameters:' => 'Parametry PHP:',
+		'PHP parameters:' => 'Parametry PHP',
 		'Cannot upload files' => 'Nie można przesłać plików',
 		'Cannot create new files and folders' => 'Nie można stworzyć nowych folderów ani plików ',
 		'GD Library is not installed' => 'Biblioteka GD nie jest zainstalowana',
 		'MySQL support is not activated' => 'Obsługa MySQL nie jest włączona',
-		'Recursive write permissions on files and folders:' => 'Prawa do zapisu (rekursywnie) w plikach/ folderach:',
+		'Recursive write permissions on files and folders:' => 'Prawa do zapisu (rekursywnie) w plikach/ folderach',
 		'Cannot open external URLs' => 'Nie można otworzyć zewnętrznych adresów URL ',
-		'Database name:' => 'Nazwa bazy danych:',
-		'Database login:' => 'Użytkownik bazy danych:',
-		'Database password:' => 'Hasło bazy danych:',
-		'Database Engine:' => 'Typ bazy danych:',
-		'Tables prefix:' => 'Prefix tabel:',
-		'Drop existing tables (mode dev):' => 'Usuwanie tabel (tryb dev.)',
+		'Database name' => 'Nazwa bazy danych',
+		'Database login' => 'Użytkownik bazy danych',
+		'Database password' => 'Hasło bazy danych',
+		'Database Engine:' => 'Typ bazy danych',
+		'Tables prefix' => 'Prefix tabel',
+		'Drop existing tables (mode dev)' => 'Usuwanie tabel (tryb dev.)',
 		'Test your database connection now!' => 'Przetestuj połączenie z bazą danych! ',
 		'PHP register global option is on' => 'PHP opcja register_globals jest aktywna',
 		'GZIP compression is not activated' => 'Kompresja GZIP nie jest włączona',
@@ -99,8 +99,8 @@ return array(
 		'File "language.xml" not valid for language iso "%s"' => 'Plik "language.xml" jest niepoprawny dla iso "%s" ',
 		'Encryption:' => 'Szyfrowanie',
 		'None' => 'Żaden',
-		'Port:' => 'Port:',
-		'Login:' => 'Login:',
+		'Port:' => 'Port',
+		'Login:' => 'Login',
 		'enter@your.email' => 'wpisz@twój.email',
 		'Send me a test email!' => 'Wyślij testowego e-maila!',
 		'Next' => 'Następny',
@@ -119,48 +119,48 @@ return array(
 		'Fixtures class "%s" not found' => 'Terminarz klasy "%s" nie został znaleziony',
 		'"%s" must be an instane of "InstallXmlLoader"' => '"%s" musi być instancją "Install Xml Loader"',
 		'Information about your Store' => 'Informacje dotyczące Twojego sklepu',
-		'Shop name:' => 'Nazwa sklepu:',
-		'Main activity:' => 'Główna działalność:',
+		'Shop name' => 'Nazwa sklepu',
+		'Main activity' => 'Główna działalność',
 		'Please choose your main activity' => 'Proszę wybrać działalność',
-		'Other activity...' => 'Inne:',
+		'Other activity...' => 'Inne',
 		'Yes' => 'Tak',
 		'No' => 'Nie',
-		'Default country:' => 'Kraj:',
+		'Default country:' => 'Kraj',
 		'Select your country' => 'Wybierz swój kraj',
-		'Shop timezone:' => 'Strefa czasowa:',
+		'Shop timezone:' => 'Strefa czasowa',
 		'Select your timezone' => 'Wybierz swoją strefę czasową',
-		'Shop logo:' => 'Logo sklepu:',
+		'Shop logo:' => 'Logo sklepu',
 		'Your Account' => 'TWOJE KONTO',
-		'First name:' => 'Imię:',
-		'Last name:' => 'Nazwisko:',
-		'Shop password:' => 'Hasło:',
+		'First name' => 'Imię',
+		'Last name' => 'Nazwisko',
+		'Shop password' => 'Hasło',
 		'Optional - You can add you logo at a later time.' => 'Opcjonalnie: Możesz dodać logo w późniejszym czasie',
-		'E-mail address:' => 'Adres e-mail:',
+		'E-mail address' => 'Adres e-mail',
 		'This email address will be your username to access your store\'s back office.' => 'Adres e-mail będzie służył jako login w panelu administracyjnym sklepu.',
-		'Password:' => 'Hasło:',
+		'Password' => 'Hasło',
 		'Installation Assistant' => 'Asystent instalacji ',
 		'License Agreements' => 'Umowy licencyjne',
 		'I agree to the above terms and conditions.' => 'Zgadzam się z powyższymi warunkami.',
 		'Done!' => 'Gotowe!',
 		'An error occured during installation...' => 'Wystąpił błąd podczas instalacji ... ',
 		'Your installation is finished!' => 'Instalacja została zakończona!',
-		'Please remember your login information:' => 'Proszę o zapamiętanie danych logowania:',
-		'E-mail:' => 'E-mail:',
+		'Please remember your login information' => 'Proszę o zapamiętanie danych logowania',
+		'E-mail' => 'E-mail',
 		'Print my login information' => 'Wydrukuj tę stronę',
 		'Display' => 'Wyświetl',
 		'Must be alphanumeric string with at least 8 characters' => 'Hasło musi posiadać co najmniej 8 znaków alfanumerycznych',
-		'Re-type to confirm:' => 'Potwierdzenie hasła:',
+		'Re-type to confirm' => 'Potwierdzenie hasła',
 		'Sign-up to the newsletter' => 'Zapisz się do newslettera PrestaShop ',
-		'Configure your database by filling out the following fields:' => 'Skonfiguruj połączenie z bazą danych wypełniając następujące pola:',
+		'Configure your database by filling out the following fields' => 'Skonfiguruj połączenie z bazą danych wypełniając następujące pola',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Proszę o wypełnienie poniższych pól w celu połączenia PrestaShop z Twoją bazą danych ',
-		'Database server address:' => 'Adres serwera bazy danych:',
+		'Database server address' => 'Adres serwera bazy danych',
 		'Help us learn more about your store so we can offer you optimal guidance and the best features for your business!' => 'Przedstaw swój profil, abyśmy mogli poradzić Ci jaka funkcjonalność pasuje do Twojego biznesu.',
-		'Install demo products:' => 'Instalacja demo produktów:',
+		'Install demo products' => 'Instalacja demo produktów',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Demo produktów jest dobrym sposobem do nauczenia się korzystania z PrestaShop.',
 		'E-mail delivery set-up' => 'Konfiguracja do wysyłania e-maili',
 		'Configure SMTP manually (advanced users only)' => 'Skonfiguruj serwer SMTP (tryb zaawansowany)',
 		'By default, the PHP mail() function is used' => 'Domyślnie - PHP mail () funkcja jest używana.',
-		'SMTP server address:' => 'Adres serwera SMTP:',
+		'SMTP server address:' => 'Adres serwera SMTP',
 		'PrestaShop can provide you with guidance on a regular basis by sending you tips on how to optimize the management of your store which will help you grow your business. If you do not wish to receive these tips, please uncheck this box.' => 'PrestaShop wysyła regularnie wskazówki dotyczące optymalizacji zarządzania sklepem. Jeśli nie chcesz ich otrzymywać, odznacz pole.',
 		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Aby korzystać z PrestaShop, musisz <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">stworzyć baze danych</a>, w celu zebrania wszystkich danych dotyczących funkcjonowania Twojego sklepu.',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'Jeśli chcesz użyć innego portu niż port domyślny (3306), dodaj ":XX" do adresu Twojego serwera - gdzie XX oznacza numer portu.',
@@ -182,8 +182,8 @@ return array(
 		'PrestaShop compatibility with your system environment has been verified!' => 'Zgodność PrestaShop z Twoim systemem została zweryfikowana!',
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => 'Proszę poprawić punkt/y znajdujące się poniżej i wybrać przycisk \'\'Odśwież informacje\'\' w celu przeprowadzenia testu kompatybilności nowego systemu. ',
 		'Refresh these settings' => 'Odśwież ustawienia',
-		'Welcome to the PrestaShop %s Installer.' => 'Etapy instalacji PrestaShop %s ',
-		'Continue the installation in:' => 'Kontynuuj instalację w:',
+		'Welcome to the PrestaShop %s Installer' => 'Etapy instalacji PrestaShop %s',
+		'Continue the installation in' => 'Kontynuuj instalację w',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop wymaga co namniej 32M pamięci do odpowiedniego funkcjonowania. Proszę o sprawdzenie wartości dyrektywy memory_limit w pliku php.ini lub skontaktowanie się z Twoim hostingowcem.     ',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'Instalacja PrestaShop odbywa się w łatwy i szybki sposób! W kilka minut dołączysz do 150 000 właścicieli sklepów internetowych w Europie, korzystających z naszego oprogramowania e-commerce. Będziesz mógł stworzyć swój sklep według własnych potrzeb i zarządzać nim w prosty sposób.',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Jeśli potrzebujesz pomocy zapoznaj się z <a href="%1$s" target="_blank">naszą dokumentacją</a> lub skontaktuj się z działem technicznym;%2$s',
@@ -194,7 +194,7 @@ return array(
 		'menu_database' => 'Konfiguracja systemu',
 		'menu_configure' => 'Informacje o sklepie',
 		'menu_process' => 'Instalacja sklepu',
-		'Your PHP sessions path is not writable - check with your hosting provider:' => 'Twoja ścieżka sesji PHP jest niezapisywalna - skontaktuj się z dostawcą usług hostingowych:',
+		'Your PHP sessions path is not writable - check with your hosting provider:' => 'Twoja ścieżka sesji PHP jest niezapisywalna - skontaktuj się z dostawcą usług hostingowych',
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Aby zainstalować PrestaShop, musisz mieć włączoną obsługę JavaScript w przeglądarce.',
 		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript ',
 		'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Przed skorzystaniem z darmowych funkcji oferowanych przez PrestaShop zapoznaj się z warunkami licencji. PrestaShop funkcjonuje na licencji OSL 3,0 zaś moduły i szablony na AFL 3,0.',
@@ -202,9 +202,12 @@ return array(
 		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation ',
 		'Database is created' => 'Baza danych jest tworzona ',
 		'Cannot create the database automatically' => 'Nie można automatycznie utworzyć bazy danych',
-		'Install modules Addons' => 'Instalacja modułów Addons',
+		'Install Addons modules' => 'Instalacja modułów Addons',
 		'Attempt to create the database automatically' => 'Próba utworzenia automatycznie bazy danych',
-		'Country:' => 'Kraj',
+		'Country' => 'Kraj',
 		'Must be letters and numbers with at least 8 characters' => 'Minimum 8 znaków z użyciem liter i cyfr',
+		'Must be at least 8 characters' => 'Min. 8 znaków',
+		'Files' => 'Dokumenty',
+		'All files are not successfuly uploaded on your server' => 'Pliki nie zostały przesłane do serwera',
 	),
-);
+);
\ No newline at end of file
diff --git a/install-dev/langs/ru/data/meta.xml b/install-dev/langs/ru/data/meta.xml
index f53ef2f4a..7c86b7653 100755
--- a/install-dev/langs/ru/data/meta.xml
+++ b/install-dev/langs/ru/data/meta.xml
@@ -70,7 +70,7 @@
     <title>Адреса</title>
     <description/>
     <keywords/>
-    <url_rewrite>address</url_rewrite>
+    <url_rewrite>addresses</url_rewrite>
   </meta>
   <meta id="authentication" id_shop="1">
     <title>Аутентификация</title>
diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index 395fe5f71..4b27fd2b0 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -60,13 +60,13 @@ return array(
 		'Install demonstration data' => 'Установка демонстрационной версии',
 		'Install theme' => 'Установка темы',
 		'Send information e-mail' => 'Отправить информационное письмо',
-		'PHP parameters:' => 'Параметры PHP:',
+		'PHP parameters:' => 'Параметры PHP',
 		'Is PHP 5.1.2 or later installed ?' => 'Используете PHP 5.1.2 или более старую версию?',
 		'Can upload files ?' => 'Не можете загрузить файлы?',
 		'Can create new files and folders ?' => 'Не можете создать новые файлы или папки?',
 		'Is GD Library installed ?' => 'У Вас установлена GD Library?',
 		'Is MySQL support is on ?' => 'Ваш MySQL support активирован?',
-		'Recursive write permissions on files and folders:' => 'Рекурсивное право перезаписи файлов и папок:',
+		'Recursive write permissions on files and folders:' => 'Рекурсивное право перезаписи файлов и папок',
 		'Can open external URLs ?' => 'Можете переходить внешние URLs ?',
 		'Is PHP register global option off (recommended) ?' => 'Дезактивировали ли Вы  опцию PHP "Общий регистр" (рекомендовано)?',
 		'Is GZIP compression activated (recommended) ?' => 'Активировали ли Вы архивирование GZIP (рекомендовано)?',
@@ -100,49 +100,49 @@ return array(
 		'Fixtures class "%s" not found' => 'Отображение класса "%s"не найдено',
 		'"%s" must be an instane of "InstallXmlLoader"' => '"%s" должен быть компонентом "InstallXmlLoader"',
 		'Shop settings and merchant account information' => 'Установки магазина и информация об аккаунте клиента',
-		'Shop name:' => 'Название магазина:',
-		'Main activity:' => 'Основная деятельность:',
+		'Shop name' => 'Название магазина',
+		'Main activity' => 'Основная деятельность',
 		'Please choose your main activity' => 'Выберите Вашу основную деятельность',
 		'Other activity...' => 'Другая деятельность....',
 		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'Эта информация необязательна, она будет использована для статистики. Эта информация не изменит ничего в Вашем магазине.',
-		'Install demo products:' => 'Установите демо-версию продуктов:',
+		'Install demo products' => 'Установите демо-версию продуктов',
 		'Yes' => 'Да',
 		'No' => 'Нет',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => 'Демо-версия поможет Вам получше познакомиться с  PrestaShop.',
-		'Default country:' => 'Страна по-умолчанию:',
+		'Default country:' => 'Страна по-умолчанию',
 		'Select your country' => 'Выберите Вашу страну',
-		'Shop timezone:' => 'Часовой пояс магазина:',
+		'Shop timezone:' => 'Часовой пояс магазина',
 		'Select your timezone' => 'Выберите Ваш часовой пояс',
-		'Shop logo:' => 'Логотип магазина:',
-		'Recommended dimensions:' => 'Рекомендуемые размеры:',
-		'First name:' => 'Имя:',
-		'Last name:' => 'Фамилия:',
-		'E-mail address:' => 'Адрес электронной почты:',
-		'Shop password:' => 'Пароль магазина:',
+		'Shop logo:' => 'Логотип магазина',
+		'Recommended dimensions:' => 'Рекомендуемые размеры',
+		'First name' => 'Имя',
+		'Last name' => 'Фамилия',
+		'E-mail address' => 'Адрес электронной почты',
+		'Shop password' => 'Пароль магазина',
 		'Must be alphanumeric string with at least 8 characters' => 'Он должен состоять из букв и цифр и содержать минимум 8 знаков',
-		'Re-type to confirm:' => 'Подтвердите пароль:',
+		'Re-type to confirm' => 'Подтвердите пароль',
 		'Receive this information by e-mail' => 'Получить данную информацию по электронной почте ',
 		'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Внимание: Вы получите данное сообщение только в случае верной конфигурации Вашего электронного почтового ящика.',
-		'Configure your database by filling out the following fields:' => 'Заполните поля ниже для конфигурации Вашей базы данных:',
+		'Configure your database by filling out the following fields' => 'Заполните поля ниже для конфигурации Вашей базы данных',
 		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => 'При создании базы данных Вы сожете воспользоваться  <a href="http://doc.prestashop.com" target="_blank">нашей электронной документацией n</a>.',
-		'Database server address:' => 'Адрес сервера базы данных:',
+		'Database server address' => 'Адрес сервера базы данных',
 		'If you want to use a different port, add :XX after your server address where XX is your port number.' => 'Если Вы хотите использовать другой порт, добавьте :XX после адреса Вашего сервера, где XX это номер Вашего порта.',
-		'Database name:' => 'Название базы данных:',
-		'Database login:' => 'Логин  базы данных:',
-		'Database password:' => 'Пароль базы данных:',
-		'Database Engine:' => 'Подсистема для базы данных:',
-		'Tables prefix:' => 'Префикс таблицы:',
-		'Drop existing tables (mode dev):' => 'Удалите существующие таблицы (режим dev):',
+		'Database name' => 'Название базы данных',
+		'Database login' => 'Логин  базы данных',
+		'Database password' => 'Пароль базы данных',
+		'Database Engine:' => 'Подсистема для базы данных',
+		'Tables prefix' => 'Префикс таблицы',
+		'Drop existing tables (mode dev)' => 'Удалите существующие таблицы (режим dev)',
 		'Verify now!' => 'Проверьте прямо сейчас!',
 		'E-mail delivery set-up' => 'Установка функции отправки электронных сообщений',
 		'Configure SMTP manually (advanced users only)' => 'Сконфигурируйте SMTP вручную (только для продвинутых пользователей)',
 		'By default, the PHP mail() function is used' => 'По умолчанию используется функция PHP для отправки ()электронных сообщений',
-		'SMTP server address:' => 'Адрес SMTP сервера:',
-		'Encryption:' => 'Защищенное соединение:',
+		'SMTP server address:' => 'Адрес SMTP сервера',
+		'Encryption:' => 'Защищенное соединение',
 		'None' => 'Не выбрано',
-		'Port:' => 'Порт:',
-		'Login:' => 'Логин:',
-		'Password:' => 'Пароль:',
+		'Port:' => 'Порт',
+		'Login:' => 'Логин',
+		'Password' => 'Пароль',
 		'enter@your.email' => 'Введите Ваш e-mail',
 		'Send me a test email!' => 'Отправить тестовое сообщение',
 		'Next' => 'Далее',
@@ -161,8 +161,8 @@ return array(
 		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => 'Вы можете использовать ссылки левой колонки для перехода к предыдущим этапам или же снова начать установку <a href="%s">, кликнув </a>.',
 		'Your installation is finished!' => 'Процесс установки упешно завершен',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => 'Установка Вашего магазина успешно завершена. Спасибо, что Вы выбрали PrestaShop!',
-		'Please remember your login information:' => 'Запомните, пожалуйста, Ваши идентификационные данные',
-		'E-mail:' => 'E-mail:',
+		'Please remember your login information' => 'Запомните, пожалуйста, Ваши идентификационные данные',
+		'E-mail' => 'E-mail',
 		'Display' => 'Отображать',
 		'WARNING: For security purposes, you must delete the "install" folder.' => 'ВНИМАНИЕ: В мерах предосторожности рекомендуем удалить папку  "install" ',
 		'Back Office' => 'Бэк-офис',
@@ -174,15 +174,15 @@ return array(
 		'Required set-up. Please verify the following checklist items are true.' => 'Обязательная установка. Проверьте  правильность введенных данных.',
 		'If you have any questions, please visit our <a href="%1$s" target="_blank">documentation</a> and <a href="%2$s" target="_blank">community forum</a>.' => 'Если у Вас возникнут вопросы, Вы сможете найти ответы на них в нашей документации <a href="%1$s" target="_blank"> </a> и <a href="%2$s" target="_blank">на форуме сообщества</a>.',
 		'Your configuration is valid, click next to continue!' => 'Ваша конфигурация подтверждена, нажмите далее, чтобы продолжить!',
-		'Your configuration is invalid. Please fix the issues below:' => 'Ваша конфигурация неверна. Заполните, пожалуйста, следующие поля:',
+		'Your configuration is invalid. Please fix the issues below:' => 'Ваша конфигурация неверна. Заполните, пожалуйста, следующие поля',
 		'Optional set-up' => 'Необязательная установка',
 		'Refresh these settings' => 'Обновите параметры установки',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'Для работы PrestaShop потребуется минимум 32M памяти, проверьте memory_limit directive в php.ini или свяжитесь с Вашим провайдером ',
 		'<b>Warning: You cannot use anymore this tool to upgrade your store.</b><br /><br />You already have <b>PrestaShop version %1$s installed</b>.<br /><br />If you want to upgrade to the latest version please read our documentation: <a href="%2$s">%2$s</a>' => '<b>Внимание: Вы больше не можете использовать этот инструмент для обновления Вашего магазина.</b><br /><br />Вы уже установлен <b>PrestaShop версии %1$s </b>.<br /><br />Вы можете прочитать в нашей документации, как перейти на более новую версию: <a href="%2$s">%2$s</a>',
-		'Welcome to the PrestaShop %s Installer.' => 'Добро пожаловать в установщик PrestaShop %s.',
+		'Welcome to the PrestaShop %s Installer' => 'Добро пожаловать в установщик PrestaShop %s',
 		'The installation process should take only few minutes!' => 'Установка магазина займет всего несколько минут!',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => 'Если у Вас возникнут вопросы, Вы можете найти ответ на них в нашей документации  <a href="%1$s" target="_blank"> </a> или связаться с нашей службой поддержки: %2$s',
-		'Choose the installer language:' => 'Выберите язык установки:',
+		'Choose the installer language:' => 'Выберите язык установки',
 		'Did you know?' => 'Знаете ли Вы?',
 		'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop и сообщество компании бесплатно предлагает около 40 языков, данная опция доступна прямо из Вашего бэк-офиса.',
 		'menu_license' => 'Лицензионное соглашение',
@@ -217,7 +217,7 @@ return array(
 		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => 'Для использования PrestaShop, Вам следует <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">создать базу данных </a>, чтобы сгруппировать информацию Вашего магазина.',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Заполните поля ниже, чтобы  PrestaShop смог установить соединение с Вашей с базой данных.',
 		'The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".' => 'Порт по умолчанию: 3306. Если Вы используете другой порт, то введите номер порта в адрес Вашего сервера. пример: ":4242".',
-		'Continue the installation in:' => 'Продолжить установку:',
+		'Continue the installation in' => 'Продолжить установку',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => 'Выбранный Вами язык применим только для Помощника установки. После установки магазина Вы можете выбрать любой из %d бесплатных переводов!',
 		'PrestaShop compatibility with your system environment has been verified!' => 'Полная совместимость PrestaShop проверена!',
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => 'Упс! Исправьте поле (я) выше и нажмите "Обновить информацию", чтобы проверить совместимость с Вашей новой системой.',
@@ -231,11 +231,11 @@ return array(
 		'menu_configure' => 'Информация о магазине',
 		'menu_welcome' => 'Выберите язык',
 		'Your PHP sessions path is not writable - check with your hosting provider:' => 'Дисковая память недоступна в письменном виде - обратитесь к Вашему хостинг-провайдеру',
-		'Install modules Addons' => 'Установка модулей Addons',
+		'Install Addons modules' => 'Установка модулей Addons',
 		'Database is created' => 'База данных создана',
 		'Cannot create the database automatically' => 'Невозможно автоматически создать базу данных',
 		'Attempt to create the database automatically' => 'Попытка автоматического создания базы данных',
-		'Country:' => 'Страна:',
+		'Country' => 'Страна',
 		'Must be letters and numbers with at least 8 characters' => 'Должен состоять из букв и цифр и содержать минимум 8 символов',
 		'To install PrestaShop, you need to have JavaScript enabled in your browser.' => 'Чтобы установить PrestaShop, Вам нужно включить JavaScript в Вашем браузере.',
 		'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript' => 'http://doc.prestashop.com/display/PS15/What+you+need+to+get+started#HowtoenableJavaScript-HowtoenableJavaScript',
@@ -244,5 +244,6 @@ return array(
 		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
 		'Files' => 'Файлы',
 		'All files are not successfuly uploaded on your server' => 'Все файлы успешно загружены на ваш сервер',
+		'Must be at least 8 characters' => 'Минимум 8 символов',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/langs/tw/install.php b/install-dev/langs/tw/install.php
index e93160980..5677f4254 100644
--- a/install-dev/langs/tw/install.php
+++ b/install-dev/langs/tw/install.php
@@ -15,7 +15,7 @@ return array(
 		'menu_database' => '系統設定',
 		'menu_configure' => '商店資訊',
 		'menu_process' => '商店安裝',
-		'Choose the installer language:' => '選擇安裝語言：',
+		'Choose the installer language:' => '選擇安裝語言',
 		'Field required' => '必填欄位',
 		'Invalid shop name' => '商店名稱有誤',
 		'Your firstname contains some invalid characters' => '您的姓名包含錯誤字元',
@@ -45,13 +45,13 @@ return array(
 		'Install modules' => '安裝模組',
 		'Install demonstration data' => '安裝展示資料',
 		'Install theme' => '安裝佈景',
-		'PHP parameters:' => 'PHP參數：',
+		'PHP parameters:' => 'PHP參數',
 		'Is PHP 5.1.2 or later installed ?' => '是否安裝 PHP 5.1.2 或更新版本？',
 		'Can upload files ?' => '是否能夠上傳檔案？',
 		'Can create new files and folders ?' => '是否能夠建立檔案與資料夾？',
 		'Is GD Library installed ?' => '是否安裝 GD 函式庫？',
 		'Is MySQL support is on ?' => '是否支援 MySQL ？',
-		'Recursive write permissions on files and folders:' => '檔案與資料夾的遞迴寫入權限：',
+		'Recursive write permissions on files and folders:' => '檔案與資料夾的遞迴寫入權限',
 		'Can open external URLs ?' => '是否能夠開啟外部網址？',
 		'Is PHP register global option off (recommended) ?' => '是否停用 PHP register global 選項？',
 		'Is GZIP compression activated (recommended) ?' => '是否支援 GZIP 壓縮（建議）？',
@@ -60,48 +60,48 @@ return array(
 		'Is Dom extension loaded ?' => '是否載入 Dom 外掛？',
 		'Is PDO MySQL extension loaded ?' => '是否載入 PDO MySQL 外掛？',
 		'Shop settings and merchant account information' => '商店設定與帳號資訊',
-		'Shop name:' => '商店名稱：',
-		'Main activity:' => '主要活動：',
+		'Shop name' => '商店名稱',
+		'Main activity' => '主要活動',
 		'Please choose your main activity' => '請選擇主要活動',
 		'Other activity...' => '其他活動...',
 		'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.' => 'This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.',
-		'Install demo products:' => '安裝展示用產品：',
+		'Install demo products' => '安裝展示用產品',
 		'Yes' => '是',
 		'No' => '否',
 		'Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.' => '展示用產品適合用來學習使用 PrestaShop ，如果還不熟悉系統就建議安裝',
-		'Default country:' => '預設國家：',
+		'Default country:' => '預設國家',
 		'Select your country' => '選擇您的國家',
-		'Shop timezone:' => '商店時區：',
+		'Shop timezone:' => '商店時區',
 		'Select your timezone' => '選擇您的時區',
-		'Shop logo:' => '商店圖示：',
-		'Recommended dimensions:' => '建議的大小：',
-		'First name:' => '姓名：',
-		'Last name:' => '姓氏：',
-		'E-mail address:' => '電子信箱：',
-		'Shop password:' => '商店密碼：',
-		'Re-type to confirm:' => '再次輸入確認：',
+		'Shop logo:' => '商店圖示',
+		'Recommended dimensions:' => '建議的大小',
+		'First name' => '姓名',
+		'Last name' => '姓氏',
+		'E-mail address' => '電子信箱',
+		'Shop password' => '商店密碼',
+		'Re-type to confirm' => '再次輸入確認',
 		'Receive this information by e-mail' => '透過電子郵件收取這個資訊',
 		'Warning: You will receive this information only if your e-mail configuration is correct.' => '警告：只有在郵件設定正確時您才能夠收到這個資訊',
-		'Configure your database by filling out the following fields:' => '填寫下面欄位來設定資料庫：',
+		'Configure your database by filling out the following fields' => '填寫下面欄位來設定資料庫',
 		'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.' => 'You have to create a database, help available in <a href="http://doc.prestashop.com" target="_blank">our online documentation</a>.',
-		'Database server address:' => '伺服器位址：',
+		'Database server address' => '伺服器位址',
 		'If you want to use a different port, add :XX after your server address where XX is your port number.' => '如果您想要用其他的連接埠，可以在位址後面加入 :XX ， XX 就代表您使用的連接埠',
-		'Database name:' => '資料庫名稱：',
-		'Database login:' => '帳號：',
-		'Database password:' => '密碼：',
-		'Database Engine:' => '引擎：',
-		'Tables prefix:' => '資料表前綴：',
-		'Drop existing tables (mode dev):' => '移除現有資料表（開發用）：',
+		'Database name' => '資料庫名稱',
+		'Database login' => '帳號',
+		'Database password' => '密碼',
+		'Database Engine:' => '引擎',
+		'Tables prefix' => '資料表前綴',
+		'Drop existing tables (mode dev)' => '移除現有資料表（開發用）',
 		'Verify now!' => '現在檢查！',
 		'E-mail delivery set-up' => '電子郵件寄發設定',
 		'Configure SMTP manually (advanced users only)' => '手動設定 SMTP （只適合進階使用者）',
 		'By default, the PHP mail() function is used' => '預設會使用 PHP mail() 方式',
-		'SMTP server address:' => 'SMTP 伺服器位址：',
-		'Encryption:' => '加密方式：',
+		'SMTP server address:' => 'SMTP 伺服器位址',
+		'Encryption:' => '加密方式',
 		'None' => '無',
-		'Port:' => '連接埠：',
-		'Login:' => '帳號：',
-		'Password:' => '密碼：',
+		'Port:' => '連接埠',
+		'Login:' => '帳號',
+		'Password' => '密碼',
 		'enter@your.email' => 'enter@your.email ',
 		'Send me a test email!' => '發送測試信件！',
 		'Next' => '下一步',
@@ -117,7 +117,7 @@ return array(
 		'You can use the links on the left column to go back to the previous steps, or restart the installation process by <a href="%s">clicking here</a>.' => '您可以使用左邊的連結來回到上一步，或是 <a href="%s">點選這裡</a> 重新開始安裝程序',
 		'Your installation is finished!' => '您的安裝已經完成！',
 		'You have just finished installing your shop. Thank you for using PrestaShop!' => '您已經安裝完成，歡迎使用 PrestaShop ！',
-		'Please remember your login information:' => '請記住您的帳號資訊：',
+		'Please remember your login information' => '請記住您的帳號資訊',
 		'WARNING: For security purposes, you must delete the "install" folder.' => '警告：基於安全考量，您必須刪除 "install" 資料夾',
 		'Back Office' => '後台',
 		'Manage your store using your Back Office. Manage your orders and customers, add modules, change themes, etc.' => '透過後台可以管理您的商店，包括訂單、客戶、模組與佈景等等',
@@ -127,10 +127,10 @@ return array(
 		'Discover your store' => '瀏覽您的商店',
 		'Required set-up. Please verify the following checklist items are true.' => '必要的安裝，請檢查下面清單的項目',
 		'Your configuration is valid, click next to continue!' => '您的設定正確，請點選下一步繼續！',
-		'Your configuration is invalid. Please fix the issues below:' => '您的設定有誤，請修正下面問題：',
+		'Your configuration is invalid. Please fix the issues below:' => '您的設定有誤，請修正下面問題',
 		'Optional set-up' => '選擇性安裝',
 		'Refresh these settings' => '重新整理這些設定',
-		'Welcome to the PrestaShop %s Installer.' => '歡迎安裝 PrestaShop %s',
+		'Welcome to the PrestaShop %s Installer' => '歡迎安裝 PrestaShop %s',
 		'The installation process should take only few minutes!' => '安裝過程只要幾分鐘時間！',
 		'If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s' => '如果您需要協助，可以瀏覽 <a href="%1$s" target="_blank">線上文件</a> 或是聯絡我們的支援團隊： %2$s',
 		'Did you know?' => '您知道嗎？',
@@ -189,7 +189,7 @@ return array(
 		'We are currently checking PrestaShop compatibility with your system environment' => '正在檢查系統環境的相容性',
 		'Oops! Please correct the item(s) below, and then click "Refresh information" to test the compatibility of your new system.' => '請修正下面項目，然後點選 "重新整理資訊" 來測試系統相容性',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 130,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => '安裝 PrestaShop 快又容易，只要一下子，您就可以加入超過 130,000 個網站使用的軟體社群。您正在建立屬於自己獨一無二的線上商店，每天都可以輕鬆管理。',
-		'Continue the installation in:' => '繼續安裝：',
+		'Continue the installation in' => '繼續安裝',
 		'The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!' => '上面選擇的語言只用在安裝過程，一旦完成安裝，您可以為商店加入超過 %d 種翻譯，而且都是免費的！',
 		'An error occurred during logo copy.' => '複製圖示時發生錯誤',
 		'The field %s is limited to %d characters' => '欄位 %s 限制長度為 %s 字元',
@@ -213,11 +213,11 @@ return array(
 		'Sign-up to the newsletter' => '訂閱電子報',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => '請填入下面欄位來連線您的資料庫',
 		'If you are experiencing problems during the installation process, please call our team at %s and one of our experts will be happy to help.' => '如果您在安裝過程遇到問題，請聯絡我們的團隊 %s ，我們的專家會很樂意協助',
-		'E-mail:' => '電子信箱：',
+		'E-mail' => '電子信箱',
 		'Display' => '顯示',
 		'PrestaShop compatibility with your system environment has been verified!' => '您的系統環境相容於 PrestaShop ！',
 		'PrestaShop requires at least 32M of memory to run, please check the memory_limit directive in php.ini or contact your host provider' => 'PrestaShop 需要至少 32M 記憶體來執行，請檢查 php.ini 的 memory_limit 設定或是聯絡主機提供者',
-		'Your PHP sessions path is not writable - check with your hosting provider:' => '無法寫入 PHP sessions ，請與主機提供者檢查：',
+		'Your PHP sessions path is not writable - check with your hosting provider:' => '無法寫入 PHP sessions ，請與主機提供者檢查',
 		'Lingerie and Adult' => '內衣與成人用品',
 		'Animals and Pets' => '動物與寵物',
 		'Art and Culture' => '藝術與文化',
@@ -240,11 +240,11 @@ return array(
 		'Travel' => '旅遊',
 		'Database is created' => '資料庫已經建立',
 		'Cannot create the database automatically' => '無法自動建立資料庫',
-		'Install modules Addons' => '安裝模組與外掛',
+		'Install Addons modules' => '安裝模組與外掛',
 		'Files' => '檔案',
 		'All files are not successfuly uploaded on your server' => '所有檔案成功上傳到伺服器',
 		'Attempt to create the database automatically' => '嘗試自動建立資料庫',
-		'Country:' => '國家：',
+		'Country' => '國家',
 		'Must be letters and numbers with at least 8 characters' => '必須是英文字母與數字的組合，至少 8 個字',
 		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.' => '要使用 PrestaShop ，您必須 <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">建立一個資料庫</a> 來儲存商店的資料與相關操作',
 		'If you need some assistance during the installation process, please call our team at %s and one of our experts will be happy to help.' => '在安裝過程如果需要協助，請透過 %s 與我們聯繫，我們的專家會很樂意協助',
@@ -254,5 +254,6 @@ return array(
 		'For security purposes, you must delete the "install" folder.' => '基於安全考量，您必須刪除 install 資料夾',
 		'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
 		'The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.' => 'PrestaShop 的安裝快又容易，只要一下子，您就可以加入超過 150,000 個網站構成的社群。您正在建立一個屬於自己且獨一無二的線上商店，每天都可以輕鬆的管理。',
+		'Must be at least 8 characters' => '最少 8 個字元',
 	),
 );
\ No newline at end of file
diff --git a/install-dev/theme/js/process.js b/install-dev/theme/js/process.js
index 20246ebcf..22d66d9c4 100644
--- a/install-dev/theme/js/process.js
+++ b/install-dev/theme/js/process.js
@@ -31,7 +31,7 @@ function process_install(step)
 	if (!step)
 		step = process_steps[0];
 
-	$('.installing').hide().html(step.lang + ' ...').fadeIn('slow');
+	$('.installing').hide().html(step.lang + '...').fadeIn('slow');
 
 	$.ajax({
 		url: 'index.php',
@@ -81,7 +81,7 @@ function process_install(step)
 
 function process_install_subtasks(step)
 {
-	$('.installing').hide().html(step.lang+' ...').fadeIn('slow');
+	$('.installing').hide().html(step.lang+'...').fadeIn('slow');
 	process_install_subtask(step, 0);
 }
 
diff --git a/install-dev/theme/views/configure.phtml b/install-dev/theme/views/configure.phtml
index 5b1c7b98a..d4241c0bd 100644
--- a/install-dev/theme/views/configure.phtml
+++ b/install-dev/theme/views/configure.phtml
@@ -12,7 +12,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 
 	<!-- Shop name -->
 	<div class="field clearfix">
-		<label for="infosShop" class="aligned"><?php echo $this->l('Shop name:') ?> </label>
+		<label for="infosShop" class="aligned"><?php echo $this->l('Shop name') ?> </label>
 		<div class="contentinput">
 			<input class="text required" type="text" id="infosShop" name="shop_name" value="<?php echo htmlspecialchars($this->session->shop_name) ?>" /> <sup class="required">*</sup>
 		</div>
@@ -21,7 +21,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 
 	<!-- Activity -->
 	<div class="field clearfix">
-		<label for="infosActivity" class="aligned"><?php echo $this->l('Main activity:') ?></label>
+		<label for="infosActivity" class="aligned"><?php echo $this->l('Main activity') ?></label>
 		<div class="contentinput">
 			<select id="infosActivity" name="shop_activity" class="chosen">
 				<option value="0" style="font-weight: bold" <?php if (!$this->session->shop_activity): ?>selected="selected"<?php endif; ?>><?php echo $this->l('Please choose your main activity') ?></option>
@@ -37,7 +37,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 	<?php if (_PS_MODE_DEV_): ?>
 	<!-- Install type (with fixtures or not) -->
 	<div class="field clearfix">
-		<label class="aligned"><?php echo $this->l('Install demo products:') ?></label>
+		<label class="aligned"><?php echo $this->l('Install demo products') ?></label>
 		<div class="contentinput">
 			<label>
 				<input value="full" type="radio" name="db_mode" style="vertical-align: middle;" <?php if ($this->install_type == 'full'): ?>checked="checked"<?php endif; ?> autocomplete="off" />
@@ -56,7 +56,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 
 	<!-- Country list -->
 	<div class="field clearfix">
-		<label for="infosCountry" class="aligned"><?php echo $this->l('Country:') ?></label>
+		<label for="infosCountry" class="aligned"><?php echo $this->l('Country') ?></label>
 		<div class="contentinput">
 			<select name="shop_country" id="infosCountry" class="chosen">
 				<option value="0" style="font-weight: bold"><?php echo $this->l('Select your country') ?></option>
@@ -103,7 +103,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 
 	<!-- Admin firstname -->
 	<div class="field clearfix">
-		<label for="infosFirstname" class="aligned"><?php echo $this->l('First name:') ?> </label>
+		<label for="infosFirstname" class="aligned"><?php echo $this->l('First name') ?> </label>
 		<div class="contentinput">
 			<input class="text required" type="text" id="infosFirstname" name="admin_firstname" value="<?php echo htmlspecialchars($this->session->admin_firstname) ?>" />
 			<sup class="required">*</sup>
@@ -113,7 +113,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 
 	<!-- Admin lastname -->
 	<div class="field clearfix">
-		<label for="infosName" class="aligned"><?php echo $this->l('Last name:') ?> </label>
+		<label for="infosName" class="aligned"><?php echo $this->l('Last name') ?> </label>
 		<div class="contentinput">
 			<input class="text required" type="text" id="infosName" name="admin_lastname" value="<?php echo htmlspecialchars($this->session->admin_lastname) ?>" />
 			<sup class="required">*</sup>
@@ -123,7 +123,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 
 	<!-- Admin email -->
 	<div class="field clearfix">
-		<label for="infosEmail" class="aligned"><?php echo $this->l('E-mail address:') ?> </label>
+		<label for="infosEmail" class="aligned"><?php echo $this->l('E-mail address') ?> </label>
 		<div class="contentinput">
 			<input type="text" class="text required" id="infosEmail" name="admin_email" value="<?php echo htmlspecialchars($this->session->admin_email) ?>" />
 			<sup class="required">*</sup>
@@ -134,7 +134,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 
 	<!-- Admin password -->
 	<div class="field clearfix">
-		<label for="infosPassword" class="aligned"><?php echo $this->l('Shop password:') ?> </label>
+		<label for="infosPassword" class="aligned"><?php echo $this->l('Shop password') ?> </label>
 		<div class="contentinput">
 			<input autocomplete="off" type="password" class="text required" id="infosPassword" name="admin_password" value="<?php echo htmlspecialchars($this->session->admin_password) ?>" />
 			<sup class="required">*</sup>
@@ -142,13 +142,13 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		<?php if ($this->displayError('admin_password')): ?>
 			<?php echo $this->displayError('admin_password') ?>
 		<?php else: ?>
-			<p class="userInfos aligned"><?php echo $this->l('Must be letters and numbers with at least 8 characters') ?></p>
+			<p class="userInfos aligned"><?php echo $this->l('Must be at least 8 characters') ?></p>
 		<?php endif; ?>
 	</div>
 
 	<!-- Admin password confirm -->
 	<div class="field clearfix">
-		<label class="aligned" for="infosPasswordRepeat"><?php echo $this->l('Re-type to confirm:') ?> </label>
+		<label class="aligned" for="infosPasswordRepeat"><?php echo $this->l('Re-type to confirm') ?> </label>
 		<div class="contentinput">
 			<input type="password" autocomplete="off" class="text required" id="infosPasswordRepeat" name="admin_password_confirm" value="<?php echo htmlspecialchars($this->session->admin_password_confirm) ?>" />
 			<sup class="required">*</sup>
diff --git a/install-dev/theme/views/database.phtml b/install-dev/theme/views/database.phtml
index a24c92878..d39d60f27 100644
--- a/install-dev/theme/views/database.phtml
+++ b/install-dev/theme/views/database.phtml
@@ -2,7 +2,7 @@
 
 <!-- Database configuration -->
 <div id="dbPart">
-	<h2><?php echo $this->l('Configure your database by filling out the following fields:') ?></h2>
+	<h2><?php echo $this->l('Configure your database by filling out the following fields') ?></h2>
 	<p>
 		<?php echo $this->l('To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store’s data-related activities.') ?>
 		<br />
@@ -11,20 +11,20 @@
 
 	<div id="formCheckSQL">
 		<p class="first" style="margin-top: 15px;">
-			<label for="dbServer"><?php echo $this->l('Database server address:') ?> </label>
+			<label for="dbServer"><?php echo $this->l('Database server address') ?> </label>
 			<input size="25" class="text" type="text" id="dbServer" name="dbServer" value="<?php echo htmlspecialchars($this->database_server) ?>" />
 			<span class="userInfos aligned"><?php echo $this->l('The default port is 3306. To use a different port, add the port number at the end of your server’s address i.e ":4242".') ?></span>
 		</p>
 		<p>
-			<label for="dbName"><?php echo $this->l('Database name:') ?> </label>
+			<label for="dbName"><?php echo $this->l('Database name') ?> </label>
 			<input size="10" class="text" type="text" id="dbName" name="dbName" value="<?php echo htmlspecialchars($this->database_name) ?>" />
 		</p>
 		<p>
-			<label for="dbLogin"><?php echo $this->l('Database login:') ?> </label>
+			<label for="dbLogin"><?php echo $this->l('Database login') ?> </label>
 			<input class="text" size="10" type="text" id="dbLogin" name="dbLogin" value="<?php echo htmlspecialchars($this->database_login) ?>" />
 		</p>
 		<p>
-			<label for="dbPassword"><?php echo $this->l('Database password:') ?> </label>
+			<label for="dbPassword"><?php echo $this->l('Database password') ?> </label>
 			<input class="text" size="10" type="password" id="dbPassword" name="dbPassword" value="<?php echo htmlspecialchars($this->database_password) ?>" />
 		</p>
 		<!--
@@ -36,12 +36,12 @@
 			</select>
 		</p>-->
 		<p>
-			<label for="db_prefix"><?php echo $this->l('Tables prefix:')?></label>
+			<label for="db_prefix"><?php echo $this->l('Tables prefix')?></label>
 			<input class="text" type="text" id="db_prefix" name="db_prefix" value="<?php echo htmlspecialchars($this->database_prefix) ?>" />
 		</p>
 		<?php if (_PS_MODE_DEV_): ?>
 			<p>
-				<label for="db_clear"><?php echo $this->l('Drop existing tables (mode dev):')?></label>
+				<label for="db_clear"><?php echo $this->l('Drop existing tables (mode dev)')?></label>
 				<input type="checkbox" name="database_clear" id="db_clear" value="1" <?php if ($this->database_clear): ?>checked="checked"<?php endif; ?> />
 			</p>
 		<?php endif; ?>
@@ -95,7 +95,7 @@
 			</p>
 
 			<p>
-				<label for="smtpPassword"><?php echo $this->l('Password:') ?> </label>
+				<label for="smtpPassword"><?php echo $this->l('Password') ?> </label>
 				<input autocomplete="off" class="text" type="password" size="10" id="smtpPassword" name="smtpPassword" value="<?php echo htmlspecialchars($this->smtp_password) ?>" />
 			</p>
 		</div>
diff --git a/install-dev/theme/views/process.phtml b/install-dev/theme/views/process.phtml
index 0beac6c6a..7ec2ca49d 100644
--- a/install-dev/theme/views/process.phtml
+++ b/install-dev/theme/views/process.phtml
@@ -36,10 +36,10 @@ var process_steps = <?php echo Tools::jsonEncode($this->process_steps) ?>;
 	<div class="clearfix">
 		<h2><?php echo $this->l('Your installation is finished!'); ?></h2>
 		<p><?php echo $this->l('You have just finished installing your shop. Thank you for using PrestaShop!'); ?></p>
-		<p><?php echo $this->l('Please remember your login information:') ?></p>
+		<p><?php echo $this->l('Please remember your login information') ?></p>
 		<table cellpadding="0" cellspacing="0" border="0" id="resultInstall" width="620">
 			<tr class="odd">
-				<td class="label"><?php echo $this->l('E-mail:') ?></td>
+				<td class="label"><?php echo $this->l('E-mail') ?></td>
 				<td class="resultEnd"><?php echo htmlspecialchars($this->session->admin_email) ?></td>
 				<td rowspan="2" class="print" onclick="$('#password_content').html('<?php echo htmlspecialchars(addslashes($this->session->admin_password)) ?>'); $('#password_display').hide(); window.print();">
 					<img src="theme/img/print.png" alt="" style="vertical-align:top">
@@ -47,7 +47,7 @@ var process_steps = <?php echo Tools::jsonEncode($this->process_steps) ?>;
 				</td>
 			</tr>
 			<tr>
-				<td class="label"><?php echo $this->l('Password:') ?></td>
+				<td class="label"><?php echo $this->l('Password') ?></td>
 				<td class="resultEnd">
 					<span id="password_content"><?php echo preg_replace('#.#', '*', $this->session->admin_password) ?></span>
 					<span id="password_display">
diff --git a/install-dev/theme/views/welcome.phtml b/install-dev/theme/views/welcome.phtml
index 1f23a19c5..e03780814 100644
--- a/install-dev/theme/views/welcome.phtml
+++ b/install-dev/theme/views/welcome.phtml
@@ -13,7 +13,7 @@
 		) ?></div>
 <?php endif; ?>
 
-<h2><?php echo $this->l('Welcome to the PrestaShop %s Installer.', _PS_INSTALL_VERSION_) ?></h2>
+<h2><?php echo $this->l('Welcome to the PrestaShop %s Installer', _PS_INSTALL_VERSION_) ?></h2>
 <p><?php echo $this->l('The installation of PrestaShop is quick and easy. In just a few moments, you will become part of a community consisting of more than 150,000 merchants. You are on the way to creating your own unique online store that you can manage easily every day.') ?></p>
 <p><?php echo $this->l('If you need help, do not hesitate to check <a href="%1$s" target="_blank">our documentation</a> or to contact our support team: %2$s', $this->getDocumentationLink(), $this->getPhone()) ?></p>
 
diff --git a/install-dev/upgrade/php/migrate_orders.php b/install-dev/upgrade/php/migrate_orders.php
index 5823e3cb3..9028ab073 100644
--- a/install-dev/upgrade/php/migrate_orders.php
+++ b/install-dev/upgrade/php/migrate_orders.php
@@ -34,9 +34,6 @@ function migrate_orders()
 	if (!defined('PS_TAX_INC'))
 		 define('PS_TAX_INC', 0);
 
-	// init insert order detail query
-	$values_order_detail = array();
-	$col_order_detail = array();
 	$col_order_detail_old = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'order_detail`');
 	foreach ($col_order_detail_old as $k => $field)
 		if ($field['Field'] != 'id_order_invoice')
@@ -47,8 +44,6 @@ function migrate_orders()
 
 	$insert_order_detail = 'INSERT INTO `'._DB_PREFIX_.'order_detail_2` (`'.implode('`, `', $col_order_detail).'`) VALUES ';
 
-	// init insert order query
-	$values_order = array();
 	$col_orders = array();
 	$col_orders_old = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'orders`');
 
@@ -65,125 +60,133 @@ function migrate_orders()
 	if (!$res)
 		$array_errors[] = 'unable to duplicate tables orders and order_detail';
 
-	$order_res = Db::getInstance()->query(
-			'SELECT *
-			FROM `'._DB_PREFIX_.'orders`');
-
 	// this was done like that previously
 	$wrapping_tax_rate = 1 + ((float)Db::getInstance()->getValue('SELECT value
 		FROM `'._DB_PREFIX_.'configuration`
 		WHERE name = "PS_GIFT_WRAPPING_TAX"') / 100);
 
-	$cpt = 0;
-	$flush_limit = 500;
-	while ($order = Db::getInstance()->nextRow($order_res))
+	$step = 3000;
+	$count_orders = Db::getInstance()->getValue('SELECT count(id_order) FROM '._DB_PREFIX_.'orders');
+	$nb_loop = $start = 0;
+	if($count_orders > 0)
+		$nb_loop = ceil($count_orders / $step);
+	for($i = 0; $i < $nb_loop; $i++)
 	{
-		$sum_total_products = 0;
-		$sum_tax_amount = 0;
-		$default_group_id = mo_getCustomerDefaultGroup((int)$order['id_customer']);
-		$price_display_method = mo_getPriceDisplayMethod((int)$default_group_id);
-		$order_details_list = Db::getInstance()->executeS('
-		SELECT od.*
-		FROM `'._DB_PREFIX_.'order_detail` od
-		WHERE od.`id_order` = '.(int)$order['id_order']);
-
-		foreach ($order_details_list as $order_details)
+		$order_res = Db::getInstance()->query('SELECT * FROM `'._DB_PREFIX_.'orders` LIMIT '.(int)$start.', '.(int)$step);
+		$start = intval(($i+1) * $step);
+		$cpt = 0;
+		$flush_limit = 200;
+		while ($order = Db::getInstance()->nextRow($order_res))
 		{
-			// we don't want to erase order_details data in order to create the insert query
-			$products = mo_setProductPrices($order_details, $price_display_method);
-			$tax_rate = 1 + ((float)$products['tax_rate'] / 100);
-			$reduction_amount_tax_incl = (float)$products['reduction_amount'];
-
-			// cart::getTaxesAverageUsed equivalent
-			$sum_total_products += $products['total_price'];
-			
-			$sum_tax_amount += $products['total_wt'] - $products['total_price'];
-
-			$order_details['reduction_amount_tax_incl'] = $reduction_amount_tax_incl;
-			$order_details['reduction_amount_tax_excl'] = (float)mo_ps_round($reduction_amount_tax_incl / $tax_rate);
-			$order_details['total_price_tax_incl'] = (float)$products['total_wt'];
-			$order_details['total_price_tax_excl'] = (float)$products['total_price'];
-			$order_details['unit_price_tax_incl'] = (float)$products['product_price_wt'];
-			$order_details['unit_price_tax_excl'] = (float)$products['product_price'];
-			foreach (array_keys($order_details) as $k)
-				if (!in_array($k, $col_order_detail))
-					unset($order_details[$k]);
-				else
-				{
-					if (in_array($order_details[$k], array('product_price', 'reduction_percent', 'reduction_amount', 'group_reduction', 'product_quantity_discount', 'tax_rate', 'ecotax', 'ecotax_tax_rate')))
-						$order_details[$k] = (float)$order_details[$k];
+			$sum_total_products = 0;
+			$sum_tax_amount = 0;
+			$default_group_id = mo_getCustomerDefaultGroup((int)$order['id_customer']);
+			$price_display_method = mo_getPriceDisplayMethod((int)$default_group_id);
+			$order_details_list = Db::getInstance()->query('
+			SELECT od.*
+			FROM `'._DB_PREFIX_.'order_detail` od
+			WHERE od.`id_order` = '.(int)$order['id_order']);
+			while ($order_details = Db::getInstance()->nextRow($order_details_list))
+			{
+				$values_order_detail = array();
+				$values_order = array();
+				$col_order_detail = array();
+				// we don't want to erase order_details data in order to create the insert query
+				$products = mo_setProductPrices($order_details, $price_display_method);
+				$tax_rate = 1 + ((float)$products['tax_rate'] / 100);
+				$reduction_amount_tax_incl = (float)$products['reduction_amount'];
+	
+				// cart::getTaxesAverageUsed equivalent
+				$sum_total_products += $products['total_price'];
+				
+				$sum_tax_amount += $products['total_wt'] - $products['total_price'];
+	
+				$order_details['reduction_amount_tax_incl'] = $reduction_amount_tax_incl;
+				$order_details['reduction_amount_tax_excl'] = (float)mo_ps_round($reduction_amount_tax_incl / $tax_rate);
+				$order_details['total_price_tax_incl'] = (float)$products['total_wt'];
+				$order_details['total_price_tax_excl'] = (float)$products['total_price'];
+				$order_details['unit_price_tax_incl'] = (float)$products['product_price_wt'];
+				$order_details['unit_price_tax_excl'] = (float)$products['product_price'];
+				foreach (array_keys($order_details) as $k)
+					if (!in_array($k, $col_order_detail))
+						unset($order_details[$k]);
 					else
-						$order_details[$k] = Db::getInstance()->escape($order_details[$k]);
+					{
+						if (in_array($order_details[$k], array('product_price', 'reduction_percent', 'reduction_amount', 'group_reduction', 'product_quantity_discount', 'tax_rate', 'ecotax', 'ecotax_tax_rate')))
+							$order_details[$k] = (float)$order_details[$k];
+						else
+							$order_details[$k] = Db::getInstance()->escape($order_details[$k]);
+					}
+				if (count($order_details))
+					$values_order_detail[] = '(\''.implode('\', \'', $order_details).'\')';
+				unset($order_details);
+			}
+	
+			$average_tax_used = 1;
+			if ($sum_total_products > 0)
+				$average_tax_used +=  $sum_tax_amount / $sum_total_products;
+			$average_tax_used = round($average_tax_used, 4);
+			$carrier_tax_rate = 1;
+			if (isset($order['carrier_tax_rate']))
+				$carrier_tax_rate + ((float)$order['carrier_tax_rate'] / 100);
+	
+			$total_discount_tax_excl = $order['total_discounts'] / $average_tax_used;
+			$order['total_discounts_tax_incl'] = (float)$order['total_discounts'];
+			$order['total_discounts_tax_excl'] = (float)$total_discount_tax_excl;
+	
+			$order['total_shipping_tax_incl'] = (float)$order['total_shipping'];
+			$order['total_shipping_tax_excl'] = (float)($order['total_shipping'] / $carrier_tax_rate);
+			$shipping_taxes = $order['total_shipping_tax_incl'] - $order['total_shipping_tax_excl'];
+	
+			$order['total_wrapping_tax_incl'] = (float)$order['total_wrapping'];
+			$order['total_wrapping_tax_excl'] = ((float)$order['total_wrapping'] / $wrapping_tax_rate);
+			$wrapping_taxes = $order['total_wrapping_tax_incl'] - $order['total_wrapping_tax_excl'];
+	
+			$product_taxes = $order['total_products_wt'] - $order['total_products'];
+			$order['total_paid_tax_incl'] = (float)$order['total_paid'];
+			$order['total_paid_tax_excl'] = (float)$order['total_paid'] - $shipping_taxes - $wrapping_taxes - $product_taxes;
+			// protect text and varchar fields
+			$order['gift_message'] = Db::getInstance()->escape($order['gift_message']);
+			$order['payment'] = Db::getInstance()->escape($order['payment']);
+			$order['module'] = Db::getInstance()->escape($order['module']);
+	
+			$values_order[] = '(\''.implode('\', \'', $order).'\')';
+	
+			unset($order);
+			$cpt++;
+			
+			// limit to $cpt 
+			if ($cpt >= $flush_limit)
+			{
+				$cpt = 0;
+				if (isset($values_order_detail) && count($values_order_detail) && !Db::getInstance()->execute($insert_order_detail. implode(',', $values_order_detail)))
+				{
+					$res = false;
+					$array_errors[] = '[insert order detail 1] - '.Db::getInstance()->getMsgError();
 				}
-			$values_order_detail[] = '(\''.implode('\', \'', $order_details).'\')';
-		}
-
-		$average_tax_used = 1;
-		if ($sum_total_products > 0)
-			$average_tax_used +=  $sum_tax_amount / $sum_total_products;
-		$average_tax_used = round($average_tax_used, 4);
-		$carrier_tax_rate = 1;
-		if (isset($order['carrier_tax_rate']))
-			$carrier_tax_rate + ((float)$order['carrier_tax_rate'] / 100);
-
-		$total_discount_tax_excl = $order['total_discounts'] / $average_tax_used;
-		$order['total_discounts_tax_incl'] = (float)$order['total_discounts'];
-		$order['total_discounts_tax_excl'] = (float)$total_discount_tax_excl;
-
-		$order['total_shipping_tax_incl'] = (float)$order['total_shipping'];
-		$order['total_shipping_tax_excl'] = (float)($order['total_shipping'] / $carrier_tax_rate);
-		$shipping_taxes = $order['total_shipping_tax_incl'] - $order['total_shipping_tax_excl'];
-
-		$order['total_wrapping_tax_incl'] = (float)$order['total_wrapping'];
-		$order['total_wrapping_tax_excl'] = ((float)$order['total_wrapping'] / $wrapping_tax_rate);
-		$wrapping_taxes = $order['total_wrapping_tax_incl'] - $order['total_wrapping_tax_excl'];
-
-		$product_taxes = $order['total_products_wt'] - $order['total_products'];
-		$order['total_paid_tax_incl'] = (float)$order['total_paid'];
-		$order['total_paid_tax_excl'] = (float)$order['total_paid'] - $shipping_taxes - $wrapping_taxes - $product_taxes;
-		// protect text and varchar fields
-		$order['gift_message'] = Db::getInstance()->escape($order['gift_message']);
-		$order['payment'] = Db::getInstance()->escape($order['payment']);
-		$order['module'] = Db::getInstance()->escape($order['module']);
-
-		$values_order[] = '(\''.implode('\', \'', $order).'\')';
-
-		unset($order);
-		$cpt++;
-
-		if ($cpt >= $flush_limit)
-		{
-			$cpt = 0;
-			if (!Db::getInstance()->execute($insert_order_detail. implode(',', $values_order_detail)))
-			{
-				$res = false;
-				$array_errors[] = '[insert order detail 1] - '.Db::getInstance()->getMsgError();
+				if (isset($values_order) && count($values_order) && !Db::getInstance()->execute($insert_order. implode(',', $values_order)))
+				{
+					$res = false;
+					$array_errors[] = '[insert order 2] - '.Db::getInstance()->getMsgError();
+				}
+				if (isset($values_order))
+					unset($values_order);
+				if (isset($values_order_detail))
+					unset($values_order_detail);
 			}
-			if (!Db::getInstance()->execute($insert_order. implode(',', $values_order)))
-			{
-				$res = false;
-				$array_errors[] = '[insert order 1] - '.Db::getInstance()->getMsgError();
-			}
-			$values_order = array();
-			$values_order_detail = array();
 		}
 	}
 
-	if (count($values_order_detail))
+	if (isset($values_order_detail) && count($values_order_detail) && !Db::getInstance()->execute($insert_order_detail. implode(',', $values_order_detail)))
 	{
-
-		if (!Db::getInstance()->execute($insert_order_detail. implode(',', $values_order_detail)))
-		{
-			$res = false;
-				$array_errors[] = '[insert order detail 2] - '.Db::getInstance()->getMsgError();
-		}
-		if (!Db::getInstance()->execute($insert_order. implode(',', $values_order)))
-		{
-			$res = false;
-				$array_errors[] = '[insert order 2] - '.Db::getInstance()->getMsgError();
-		}
+		$res = false;
+		$array_errors[] = '[insert order detail 3] - '.Db::getInstance()->getMsgError();
+	}
+	if (isset($values_order) && count($values_order) && !Db::getInstance()->execute($insert_order. implode(',', $values_order)))
+	{
+		$res = false;
+		$array_errors[] = '[insert order 4] - '.Db::getInstance()->getMsgError();
 	}
-
 	if (!mo_renameTables())
 	{
 		$res = false;
@@ -194,7 +197,6 @@ function migrate_orders()
 		return array('error' => 1, 'msg' => count($array_errors).' error(s) : <br/>'.implode('<br/>', $array_errors));
 }
 
-
 /**
  * mo_ps_round is a simplification of Tools::ps_round:
  * - round is always 2
diff --git a/install-dev/upgrade/php/update_customer_default_group.php b/install-dev/upgrade/php/update_customer_default_group.php
index 03bb77b6c..75b31562d 100644
--- a/install-dev/upgrade/php/update_customer_default_group.php
+++ b/install-dev/upgrade/php/update_customer_default_group.php
@@ -29,24 +29,47 @@ function update_customer_default_group()
 	$filename = _PS_ROOT_DIR_.'/config/defines.inc.php';
 	$filename_old = str_replace('.inc.', '.old.', $filename);
 	copy($filename, $filename_old);
-	@chmod($filename_old, 0664);	
+	chmod($filename_old, 0664);	
 	$content = file_get_contents($filename);
 	$pattern = "/define\('_PS_DEFAULT_CUSTOMER_GROUP_', (\d)\);/";
 	preg_match($pattern, $content, $matches);
 	if (!defined('_PS_DEFAULT_CUSTOMER_GROUP_'))
-			define('_PS_DEFAULT_CUSTOMER_GROUP_', ((isset($matches[1]) AND is_numeric($matches[1]))? (int)$matches[1] : 3));
-	$ps_customer_group = DB::getInstance()->getValue('SELECT value FROM `'._DB_PREFIX_.'configuration` WHERE name LIKE "PS_CUSTOMER_GROUP"', false);			
-	$str_old = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)_PS_DEFAULT_CUSTOMER_GROUP_.');';
-	$str_new = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)$ps_customer_group.');';				
-	$content = str_replace($str_old, $str_new, $content);
+			define('_PS_DEFAULT_CUSTOMER_GROUP_', ((isset($matches[1]) AND is_numeric($matches[1]))? $matches[1] : 3));
+	$ps_customer_group = DB::getInstance()->getValue('SELECT value FROM `'._DB_PREFIX_.'configuration` WHERE name LIKE "PS_CUSTOMER_GROUP"', false);
+	if ($ps_customer_group)
+	{		
+		$str_old = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)_PS_DEFAULT_CUSTOMER_GROUP_.');';
+		$str_new = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)$ps_customer_group.');';
+		$content = str_replace($str_old, $str_new, $content);
+	}
+
+	$carriers = Db::getInstance()->executeS('
+	SELECT `id_carrier`
+	FROM `'._DB_PREFIX_.'carrier`
+	WHERE `deleted` = 0');
+
+	$groups = Db::getInstance()->executeS('
+	SELECT `value` as id_group
+	FROM `'._DB_PREFIX_.'configuration`
+	WHERE `name` IN (\'PS_UNIDENTIFIED_GROUP\', \'PS_GUEST_GROUP\')');
+
+
+	if (count($carriers) && is_array($carriers) && count($groups) && is_array($groups))
+		foreach ($carriers as $carrier)
+			foreach ($groups as $group)
+				Db::getInstance()->execute('
+				INSERT IGNORE INTO `'._DB_PREFIX_.'carrier_group` 
+				VALUES ('.(int)$carrier['id_carrier'].', '.(int)$group['id_group'].')');
+	
 	$result = false;
 	if(file_exists($filename) && is_writable($filename))
-		$result = (bool)@file_put_contents($filename, $content);
-	if($result === true && file_exists($filename) && file_exists($filename_old))
 	{
-		@unlink($filename_old);
-		@chmod($filename, 0664);
-		return true;
+		$result = (bool)file_put_contents($filename, $content);
+		if($result && file_exists($filename_old))
+		{
+			unlink($filename_old);
+			chmod($filename, 0664);
+		}
 	}
-	return false;
+	return $result;
 }
\ No newline at end of file
diff --git a/install-dev/upgrade/php/update_order_messages.php b/install-dev/upgrade/php/update_order_messages.php
index 29d4cc07e..a9dacc791 100644
--- a/install-dev/upgrade/php/update_order_messages.php
+++ b/install-dev/upgrade/php/update_order_messages.php
@@ -35,6 +35,7 @@ function update_order_messages()
 	for($i = 0; $i < $nb_loop; $i++)
 	{
 		$sql = 'SELECT id_message, message FROM `'._DB_PREFIX_.'message` WHERE message REGEXP \''.pSQL($pattern, true).'\' LIMIT '.(int)$start.', '.(int)$step;
+		$start = intval(($i+1) * $step);
 		if ($messages = Db::getInstance()->query($sql))
 			while ($message = Db::getInstance()->nextRow($messages))
 			{
@@ -52,6 +53,7 @@ function update_order_messages()
 	for($i = 0; $i < $nb_loop; $i++)
 	{
 		$sql = 'SELECT id_customer_message, message FROM `'._DB_PREFIX_.'customer_message` WHERE message REGEXP \''.pSQL($pattern, true).'\' LIMIT '.(int)$start.', '.(int)$step;
+		$start = intval(($i+1) * $step);
 		if ($messages = Db::getInstance()->query($sql))
 			while ($message = Db::getInstance()->nextRow($messages))
 			{
diff --git a/install-dev/upgrade/sql/1.5.5.0.sql b/install-dev/upgrade/sql/1.5.5.0.sql
index c93e293ac..cb22be373 100644
--- a/install-dev/upgrade/sql/1.5.5.0.sql
+++ b/install-dev/upgrade/sql/1.5.5.0.sql
@@ -4,8 +4,7 @@ ALTER TABLE  `PREFIX_store` CHANGE  `latitude`  `latitude` DECIMAL( 13, 8 ) NULL
 
 INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES('PS_CUSTOMER_CREATION_EMAIL', 1, NOW(), NOW());
 
-ALTER TABLE `PREFIX_webservice_account` CHANGE `class_name` `class_name` VARCHAR(64) NOT NULL DEFAULT 'WebserviceRequest',
-CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
+ALTER TABLE `PREFIX_webservice_account` CHANGE `class_name` `class_name` VARCHAR(64) NOT NULL DEFAULT 'WebserviceRequest';
 
 /* PHP:add_module_to_hook(blockcart, actionCartListOverride); */;
 /* PHP:add_module_to_hook(blockmanufacturer, actionObjectManufacturerDeleteAfter); */;
diff --git a/install-dev/upgrade/sql/1.5.6.1.sql b/install-dev/upgrade/sql/1.5.6.1.sql
new file mode 100644
index 000000000..a05adbdf0
--- /dev/null
+++ b/install-dev/upgrade/sql/1.5.6.1.sql
@@ -0,0 +1,9 @@
+ALTER TABLE `PREFIX_customer_message` CHANGE `ip_address` `ip_address` VARCHAR( 15 ) NULL DEFAULT NULL;
+
+UPDATE `PREFIX_currency` SET `conversion_rate` = 1 WHERE `conversion_rate` = 0;
+
+ALTER TABLE `PREFIX_currency` CHANGE `conversion_rate` `conversion_rate` DECIMAL( 13, 6 ) NOT NULL DEFAULT '1';
+
+UPDATE `PREFIX_orders` SET conversion_rate = 1 WHERE conversion_rate = 0;
+
+ALTER TABLE `PREFIX_cms` ADD `indexation` tinyint(1) UNSIGNED NULL DEFAULT '1' AFTER `active`;
diff --git a/js/admin-products.js b/js/admin-products.js
index ef62908c0..c7c3c4ce4 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -1121,6 +1121,12 @@ product_tabs['Pack'] = new function(){
 	}
 }
 
+product_tabs['Images'] = new function(){
+	this.onReady = function(){
+		displayFlags(languages, id_language, allowEmployeeFormLang);
+	}
+}
+
 product_tabs['Features'] = new function(){
 	this.onReady = function(){
 		displayFlags(languages, id_language, allowEmployeeFormLang);
diff --git a/js/admin.js b/js/admin.js
index 1a6d311df..2a4452a25 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -36,51 +36,81 @@ function str2url(str, encoding, ucfirst)
 	else
 	{
 		/* Lowercase */
-		str = str.replace(/[\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u0101\u0103\u0105]/g, 'a');
-		str = str.replace(/[\u00E7\u0107\u0109\u010D]/g, 'c');
-		str = str.replace(/[\u010F\u0111]/g, 'd');
-		str = str.replace(/[\u00E8\u00E9\u00EA\u00EB\u0113\u0115\u0117\u0119\u011B]/g, 'e');
-		str = str.replace(/[\u011F\u0121\u0123]/g, 'g');
+		str = str.replace(/[\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u0101\u0103\u0105\u0430]/g, 'a');
+        str = str.replace(/[\u0431]/g, 'b');
+		str = str.replace(/[\u00E7\u0107\u0109\u010D\u0446]/g, 'c');
+		str = str.replace(/[\u010F\u0111\u0434]/g, 'd');
+		str = str.replace(/[\u00E8\u00E9\u00EA\u00EB\u0113\u0115\u0117\u0119\u011B\u0435\u044D]/g, 'e');
+        str = str.replace(/[\u0444]/g, 'f');
+		str = str.replace(/[\u011F\u0121\u0123\u0433\u0491]/g, 'g');
 		str = str.replace(/[\u0125\u0127]/g, 'h');
-		str = str.replace(/[\u00EC\u00ED\u00EE\u00EF\u0129\u012B\u012D\u012F\u0131]/g, 'i');
-		str = str.replace(/[\u0135]/g, 'j');
-		str = str.replace(/[\u0137\u0138]/g, 'k');
-		str = str.replace(/[\u013A\u013C\u013E\u0140\u0142]/g, 'l');
-		str = str.replace(/[\u00F1\u0144\u0146\u0148\u0149\u014B]/g, 'n');
-		str = str.replace(/[\u00F2\u00F3\u00F4\u00F5\u00F6\u00F8\u014D\u014F\u0151]/g, 'o');
-		str = str.replace(/[\u0155\u0157\u0159]/g, 'r');
-		str = str.replace(/[\u015B\u015D\u015F\u0161]/g, 's');
+		str = str.replace(/[\u00EC\u00ED\u00EE\u00EF\u0129\u012B\u012D\u012F\u0131\u0438\u0456]/g, 'i');
+		str = str.replace(/[\u0135\u0439]/g, 'j');
+		str = str.replace(/[\u0137\u0138\u043A]/g, 'k');
+		str = str.replace(/[\u013A\u013C\u013E\u0140\u0142\u043B]/g, 'l');
+        str = str.replace(/[\u043C]/g, 'm');
+		str = str.replace(/[\u00F1\u0144\u0146\u0148\u0149\u014B\u043D]/g, 'n');
+		str = str.replace(/[\u00F2\u00F3\u00F4\u00F5\u00F6\u00F8\u014D\u014F\u0151\u043E]/g, 'o');
+        str = str.replace(/[\u043F]/g, 'p');
+		str = str.replace(/[\u0155\u0157\u0159\u0440]/g, 'r');
+		str = str.replace(/[\u015B\u015D\u015F\u0161\u0441]/g, 's');
 		str = str.replace(/[\u00DF]/g, 'ss');
-		str = str.replace(/[\u0163\u0165\u0167]/g, 't');
-		str = str.replace(/[\u00F9\u00FA\u00FB\u00FC\u0169\u016B\u016D\u016F\u0171\u0173]/g, 'u');
+		str = str.replace(/[\u0163\u0165\u0167\u0442]/g, 't');
+		str = str.replace(/[\u00F9\u00FA\u00FB\u00FC\u0169\u016B\u016D\u016F\u0171\u0173\u0443]/g, 'u');
+        str = str.replace(/[\u0432]/g, 'v');
 		str = str.replace(/[\u0175]/g, 'w');
-		str = str.replace(/[\u00FF\u0177\u00FD]/g, 'y');
-		str = str.replace(/[\u017A\u017C\u017E]/g, 'z');
+		str = str.replace(/[\u00FF\u0177\u00FD\u044B]/g, 'y');
+		str = str.replace(/[\u017A\u017C\u017E\u0437]/g, 'z');
 		str = str.replace(/[\u00E6]/g, 'ae');
+        str = str.replace(/[\u0447]/g, 'ch');
+        str = str.replace(/[\u0445]/g, 'kh');
 		str = str.replace(/[\u0153]/g, 'oe');
+        str = str.replace(/[\u0448]/g, 'sh');
+        str = str.replace(/[\u0449]/g, 'ssh');
+        str = str.replace(/[\u044F]/g, 'ya');
+        str = str.replace(/[\u0454]/g, 'ye');
+        str = str.replace(/[\u0457]/g, 'yi');
+        str = str.replace(/[\u0451]/g, 'yo');
+        str = str.replace(/[\u044E]/g, 'yu');
+        str = str.replace(/[\u0436]/g, 'zh');
 
 		/* Uppercase */
-		str = str.replace(/[\u0100\u0102\u0104\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5]/g, 'A');
-		str = str.replace(/[\u00C7\u0106\u0108\u010A\u010C]/g, 'C');
-		str = str.replace(/[\u010E\u0110]/g, 'D');
-		str = str.replace(/[\u00C8\u00C9\u00CA\u00CB\u0112\u0114\u0116\u0118\u011A]/g, 'E');
-		str = str.replace(/[\u011C\u011E\u0120\u0122]/g, 'G');
+		str = str.replace(/[\u0100\u0102\u0104\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u0410]/g, 'A');
+        str = str.replace(/[\u0411]/g, 'B');
+		str = str.replace(/[\u00C7\u0106\u0108\u010A\u010C\u0426]/g, 'C');
+		str = str.replace(/[\u010E\u0110\u0414]/g, 'D');
+		str = str.replace(/[\u00C8\u00C9\u00CA\u00CB\u0112\u0114\u0116\u0118\u011A\u0415\u042D]/g, 'E');
+        str = str.replace(/[\u0424]/g, 'F');
+		str = str.replace(/[\u011C\u011E\u0120\u0122\u0413\u0490]/g, 'G');
 		str = str.replace(/[\u0124\u0126]/g, 'H');
-		str = str.replace(/[\u0128\u012A\u012C\u012E\u0130]/g, 'I');
-		str = str.replace(/[\u0134]/g, 'J');
-		str = str.replace(/[\u0136]/g, 'K');
-		str = str.replace(/[\u0139\u013B\u013D\u0139\u0141]/g, 'L');
-		str = str.replace(/[\u00D1\u0143\u0145\u0147\u014A]/g, 'N');
-		str = str.replace(/[\u00D3\u014C\u014E\u0150]/g, 'O');
-		str = str.replace(/[\u0154\u0156\u0158]/g, 'R');
-		str = str.replace(/[\u015A\u015C\u015E\u0160]/g, 'S');
-		str = str.replace(/[\u0162\u0164\u0166]/g, 'T');
-		str = str.replace(/[\u00D9\u00DA\u00DB\u00DC\u0168\u016A\u016C\u016E\u0170\u0172]/g, 'U');
+		str = str.replace(/[\u0128\u012A\u012C\u012E\u0130\u0418\u0406]/g, 'I');
+		str = str.replace(/[\u0134\u0419]/g, 'J');
+		str = str.replace(/[\u0136\u041A]/g, 'K');
+		str = str.replace(/[\u0139\u013B\u013D\u0139\u0141\u041B]/g, 'L');
+        str = str.replace(/[\u041C]/g, 'M');
+		str = str.replace(/[\u00D1\u0143\u0145\u0147\u014A\u041D]/g, 'N');
+		str = str.replace(/[\u00D3\u014C\u014E\u0150\u041E]/g, 'O');
+        str = str.replace(/[\u041F]/g, 'P');
+		str = str.replace(/[\u0154\u0156\u0158\u0420]/g, 'R');
+		str = str.replace(/[\u015A\u015C\u015E\u0160\u0421]/g, 'S');
+		str = str.replace(/[\u0162\u0164\u0166\u0422]/g, 'T');
+		str = str.replace(/[\u00D9\u00DA\u00DB\u00DC\u0168\u016A\u016C\u016E\u0170\u0172\u0423]/g, 'U');
+        str = str.replace(/[\u0412]/g, 'V');
 		str = str.replace(/[\u0174]/g, 'W');
-		str = str.replace(/[\u0176]/g, 'Y');
-		str = str.replace(/[\u0179\u017B\u017D]/g, 'Z');
+		str = str.replace(/[\u0176\u042B]/g, 'Y');
+		str = str.replace(/[\u0179\u017B\u017D\u0417]/g, 'Z');
 		str = str.replace(/[\u00C6]/g, 'AE');
+        str = str.replace(/[\u0427]/g, 'CH');
+        str = str.replace(/[\u0425]/g, 'KH');
 		str = str.replace(/[\u0152]/g, 'OE');
+        str = str.replace(/[\u0428]/g, 'SH');
+        str = str.replace(/[\u0429]/g, 'SHH');
+        str = str.replace(/[\u042F]/g, 'YA');
+        str = str.replace(/[\u0404]/g, 'YE');
+        str = str.replace(/[\u0407]/g, 'YI');
+        str = str.replace(/[\u0401]/g, 'YO');
+        str = str.replace(/[\u042E]/g, 'YU');
+        str = str.replace(/[\u0416]/g, 'ZH');
 
 		str = str.toLowerCase();
 
@@ -1107,4 +1137,4 @@ function sendBulkAction(form, action)
 		$(form).attr('action', form_action.splice(form_action.lastIndexOf('&'), 0, '&' + action));
 
 	$(form).submit();
-}
\ No newline at end of file
+}
diff --git a/js/fileuploader.js b/js/fileuploader.js
index 43235b28f..ecd6a1954 100755
--- a/js/fileuploader.js
+++ b/js/fileuploader.js
@@ -1072,9 +1072,9 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
         var queryString = qq.obj2url(params, this._options.action);
 
         xhr.open("POST", queryString, true);
+        xhr.setRequestHeader("Content-type","application/x-www-form-urlencoded");
         xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
         xhr.setRequestHeader("X-File-Name", encodeURIComponent(name));
-        xhr.setRequestHeader("Content-Type", "application/octet-stream");
         xhr.send(file);
     },
     _onComplete: function(id, xhr){
diff --git a/js/tiny_mce/plugins/advlink/js/advlink.js b/js/tiny_mce/plugins/advlink/js/advlink.js
index 703138fa5..723b0b8ac 100644
--- a/js/tiny_mce/plugins/advlink/js/advlink.js
+++ b/js/tiny_mce/plugins/advlink/js/advlink.js
@@ -385,7 +385,7 @@ function getAnchorListHTML(id, target) {
 	html = '<select id="' + id + '" name="' + id + '" class="mceAnchorList"'
 		+ ' onchange="this.form.' + target + '.value=this.options[this.selectedIndex].value"'
 		+ '>'
-		+ '<option value="">---</option>'
+		+ '<option value="">-</option>'
 		+ html
 		+ '</select>';
 
@@ -494,7 +494,7 @@ function getLinkListHTML(elm_id, target_form_element, onchange_func) {
 	if (typeof(onchange_func) != "undefined")
 		html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';
 
-	html += '"><option value="">---</option>';
+	html += '"><option value="">-</option>';
 
 	for (var i=0; i<tinyMCELinkList.length; i++)
 		html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
diff --git a/js/tiny_mce/plugins/media/js/media.js b/js/tiny_mce/plugins/media/js/media.js
index 733c5f6c2..d81e36ac6 100644
--- a/js/tiny_mce/plugins/media/js/media.js
+++ b/js/tiny_mce/plugins/media/js/media.js
@@ -413,7 +413,7 @@
 				var html = "";
 
 				html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';
-				html += '<option value="">---</option>';
+				html += '<option value="">-</option>';
 
 				for (var i=0; i<tinyMCEMediaList.length; i++)
 					html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
diff --git a/js/tiny_mce/themes/advanced/skins/o2k7/advlink.js b/js/tiny_mce/themes/advanced/skins/o2k7/advlink.js
index 703138fa5..723b0b8ac 100644
--- a/js/tiny_mce/themes/advanced/skins/o2k7/advlink.js
+++ b/js/tiny_mce/themes/advanced/skins/o2k7/advlink.js
@@ -385,7 +385,7 @@ function getAnchorListHTML(id, target) {
 	html = '<select id="' + id + '" name="' + id + '" class="mceAnchorList"'
 		+ ' onchange="this.form.' + target + '.value=this.options[this.selectedIndex].value"'
 		+ '>'
-		+ '<option value="">---</option>'
+		+ '<option value="">-</option>'
 		+ html
 		+ '</select>';
 
@@ -494,7 +494,7 @@ function getLinkListHTML(elm_id, target_form_element, onchange_func) {
 	if (typeof(onchange_func) != "undefined")
 		html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';
 
-	html += '"><option value="">---</option>';
+	html += '"><option value="">-</option>';
 
 	for (var i=0; i<tinyMCELinkList.length; i++)
 		html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
diff --git a/js/tiny_mce/themes/advanced/skins/o2k7/media.js b/js/tiny_mce/themes/advanced/skins/o2k7/media.js
index 733c5f6c2..d81e36ac6 100644
--- a/js/tiny_mce/themes/advanced/skins/o2k7/media.js
+++ b/js/tiny_mce/themes/advanced/skins/o2k7/media.js
@@ -413,7 +413,7 @@
 				var html = "";
 
 				html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';
-				html += '<option value="">---</option>';
+				html += '<option value="">-</option>';
 
 				for (var i=0; i<tinyMCEMediaList.length; i++)
 					html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
diff --git a/js/tools.js b/js/tools.js
index 137318d05..2cc6e6496 100644
--- a/js/tools.js
+++ b/js/tools.js
@@ -73,7 +73,7 @@ function formatCurrency(price, currencyFormat, currencySign, currencyBlank)
 	if (currencyFormat == 4)
 		return (formatNumber(price, priceDisplayPrecision, ',', '.') + blank + currencySign);
 	if (currencyFormat == 5)
-		return (formatNumber(price, priceDisplayPrecision, ' ', '.') + blank + currencySign);
+		return (currencySign + blank + formatNumber(price, priceDisplayPrecision, '\'', '.'));
 	return price;
 }
 
diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index d08be9733..42f964d2b 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -131,6 +131,9 @@ var ajaxCart = {
 			success: function(jsonData)
 			{
 				ajaxCart.updateCart(jsonData);
+			},
+			error: function(XMLHttpRequest, textStatus, errorThrown) {
+				alert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
 			}
 		});
 	},
@@ -175,7 +178,7 @@ var ajaxCart = {
 	},
 
 	// add a product in the cart via ajax
-	add : function(idProduct, idCombination, addedFromProductPage, callerElement, quantity, whishlist){
+	add : function(idProduct, idCombination, addedFromProductPage, callerElement, quantity, wishlist){
 		if (addedFromProductPage && !checkCustomizations())
 		{
 			alert(fieldRequired);
@@ -204,9 +207,9 @@ var ajaxCart = {
 			data: 'controller=cart&add=1&ajax=true&qty=' + ((quantity && quantity != null) ? quantity : '1') + '&id_product=' + idProduct + '&token=' + static_token + ( (parseInt(idCombination) && idCombination != null) ? '&ipa=' + parseInt(idCombination): ''),
 			success: function(jsonData,textStatus,jqXHR)
 			{
-				// add appliance to whishlist module
-				if (whishlist && !jsonData.errors)
-					WishlistAddProductCart(whishlist[0], idProduct, idCombination, whishlist[1]);
+				// add appliance to wishlist module
+				if (wishlist && !jsonData.errors)
+					WishlistAddProductCart(wishlist[0], idProduct, idCombination, wishlist[1]);
 
 				// add the picture to the cart
 				var $element = $(callerElement).parent().parent().find('a.product_image img,a.product_img_link img');
@@ -341,7 +344,7 @@ var ajaxCart = {
 								// If the cart is now empty, show the 'no product in the cart' message and close detail
 								if($('#cart_block dl.products dt').length == 0)
 								{
-									$("#cart_block").stop(true, true).slideUp(200);
+									$("#header #cart_block").stop(true, true).slideUp(200);
 									$('#cart_block_no_products:hidden').slideDown(450);
 									$('#cart_block dl.products').remove();
 								}
@@ -719,25 +722,25 @@ $(document).ready(function()
 		cart_qty = parseInt($('.ajax_cart_quantity').html());
 
 	/* roll over cart */
-	var cart_block = new HoverWatcher('#cart_block');
+	var cart_block = new HoverWatcher('#header #cart_block');
 	var shopping_cart = new HoverWatcher('#shopping_cart');
 
 	$("#shopping_cart a:first").hover(
 		function() {
 			$(this).css('border-radius', '3px 3px 0px 0px');
 			if (ajaxCart.nb_total_products > 0 || cart_qty > 0)
-				$("#header_right #cart_block").stop(true, true).slideDown(450);
+				$("#header #cart_block").stop(true, true).slideDown(450);
 		},
 		function() {
 			$('#shopping_cart a').css('border-radius', '3px');
 			setTimeout(function() {
 				if (!shopping_cart.isHoveringOver() && !cart_block.isHoveringOver())
-					$("#header_right #cart_block").stop(true, true).slideUp(450);
+					$("#header #cart_block").stop(true, true).slideUp(450);
 			}, 200);
 		}
 	);
 
-	$("#header_right #cart_block").hover(
+	$("#header #cart_block").hover(
 		function() {
 			$('#shopping_cart a').css('border-radius', '3px 3px 0px 0px');
 		},
@@ -745,7 +748,7 @@ $(document).ready(function()
 			$('#shopping_cart a').css('border-radius', '3px');
 			setTimeout(function() {
 				if (!shopping_cart.isHoveringOver())
-					$("#header_right #cart_block").stop(true, true).slideUp(450);
+					$("#header #cart_block").stop(true, true).slideUp(450);
 			}, 200);
 		}
 	);
@@ -756,7 +759,10 @@ $(document).ready(function()
 			headers: { "cache-control": "no-cache" },
 			async: true,
 			cache: false,
-			url:$(this).attr('href') + '?rand=' + new Date().getTime()
+			url:$(this).attr('href') + '?rand=' + new Date().getTime(),
+			error: function(XMLHttpRequest, textStatus, errorThrown) {
+				alert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
+			}
 		});
 		$(this).parent().parent().remove();
 		if ($('body').attr('id') == 'order' || $('body').attr('id') == 'order-opc')
@@ -825,4 +831,4 @@ function crossselling_serialScroll()
 		force:false
 	});
 	$('#blockcart_list').trigger('goto', 0);
-}
\ No newline at end of file
+}
diff --git a/modules/blockcms/BlockCMSModel.php b/modules/blockcms/BlockCMSModel.php
index d0c63ee10..88c2a969f 100644
--- a/modules/blockcms/BlockCMSModel.php
+++ b/modules/blockcms/BlockCMSModel.php
@@ -364,15 +364,20 @@ class BlockCMSModel extends ObjectModel
 		return Db::getInstance()->executeS($sql);
 	}
 
-	public static function getCMSBlockPages($id_block)
+	public static function getCMSBlockPages($id_block, $id_shop = false)
 	{
+        $id_shop = ($id_shop !== false) ? $id_shop : Context::getContext()->shop->id;
+
 		$sql = 'SELECT cl.`id_cms`, cl.`meta_title`, cl.`link_rewrite`
 			FROM `'._DB_PREFIX_.'cms_block_page` bcp
 			INNER JOIN `'._DB_PREFIX_.'cms_lang` cl
 			ON (bcp.`id_cms` = cl.`id_cms`)
 			INNER JOIN `'._DB_PREFIX_.'cms` c
 			ON (bcp.`id_cms` = c.`id_cms`)
+			INNER JOIN `'._DB_PREFIX_.'cms_shop` cs
+			ON (c.`id_cms` = cs.`id_cms`)
 			WHERE bcp.`id_cms_block` = '.(int)$id_block.'
+			AND cs.`id_shop` = '.(int)$id_shop.'
 			AND cl.`id_lang` = '.(int)Context::getContext()->language->id.'
 			AND bcp.`is_category` = 0
 			AND c.`active` = 1
@@ -534,8 +539,7 @@ class BlockCMSModel extends ObjectModel
 			{
 				$key = (int)$cmsCategory['id_cms_block'];
 				$content[$key]['display_store'] = $cmsCategory['display_store'];
-				$content[$key]['cms'] = BlockCMSModel::getCMSBlockPages($cmsCategory['id_cms_block']);
-
+				$content[$key]['cms'] = BlockCMSModel::getCMSBlockPages($cmsCategory['id_cms_block'], $id_shop);
 				$links = array();
 				if (count($content[$key]['cms']))
 				{
diff --git a/modules/blocknewproducts/blocknewproducts.php b/modules/blocknewproducts/blocknewproducts.php
index 0724a31a0..640233513 100644
--- a/modules/blocknewproducts/blocknewproducts.php
+++ b/modules/blocknewproducts/blocknewproducts.php
@@ -90,12 +90,12 @@ class BlockNewProducts extends Module
 		if (!$this->isCached('blocknewproducts.tpl', $this->getCacheId()))
 		{
 			if (!Configuration::get('NEW_PRODUCTS_NBR'))
-					return;
+				return;
 			$newProducts = false;
 			if (Configuration::get('PS_NB_DAYS_NEW_PRODUCT'))
-					$newProducts = Product::getNewProducts((int) $params['cookie']->id_lang, 0, (int)Configuration::get('NEW_PRODUCTS_NBR'));
+				$newProducts = Product::getNewProducts((int) $params['cookie']->id_lang, 0, (int)Configuration::get('NEW_PRODUCTS_NBR'));
 			if (!$newProducts && !Configuration::get('PS_BLOCK_NEWPRODUCTS_DISPLAY'))
-					return;
+				return;
 			$this->smarty->assign(array(
 				'new_products' => $newProducts,
 				'mediumSize' => Image::getSize(ImageType::getFormatedName('medium')),
@@ -145,6 +145,7 @@ class BlockNewProducts extends Module
 	{
 		$this->_clearCache('blocknewproducts.tpl');
 	}
+<<<<<<< HEAD
 	
 	public function renderForm()
 	{
@@ -214,3 +215,6 @@ class BlockNewProducts extends Module
 		);
 	}
 }
+=======
+}
+>>>>>>> d49c4cf62e1919c66dc46a4161cb8045153092c8
diff --git a/modules/blocksearch/blocksearch-top.tpl b/modules/blocksearch/blocksearch-top.tpl
index 5a5918662..83b247f89 100644
--- a/modules/blocksearch/blocksearch-top.tpl
+++ b/modules/blocksearch/blocksearch-top.tpl
@@ -29,7 +29,7 @@
 		<input type="hidden" name="controller" value="search" />
 		<input type="hidden" name="orderby" value="position" />
 		<input type="hidden" name="orderway" value="desc" />
-		<input class="search_query" type="search" id="search_query_top" name="search_query" placeholder="{l s='Search' mod='blocksearch'}" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
+		<input class="search_query" type="search" id="search_query_top" name="search_query" placeholder="{l s='Search' mod='blocksearch'}" value="{if isset($smarty.get.search_query)}{Tools::htmlentitiesUTF8($smarty.get.search_query)|stripslashes}{/if}" />
 	</form>
 </div>
 {else}
@@ -41,7 +41,7 @@
 			<input type="hidden" name="controller" value="search" />
 			<input type="hidden" name="orderby" value="position" />
 			<input type="hidden" name="orderway" value="desc" />
-			<input class="search_query" type="text" id="search_query_top" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
+			<input class="search_query" type="text" id="search_query_top" name="search_query" value="{if isset($smarty.get.search_query)}{Tools::htmlentitiesUTF8($smarty.get.search_query)|stripslashes}{/if}" />
 			<input type="submit" name="submit_search" value="{l s='Search' mod='blocksearch'}" class="button" />
 		</p>
 	</form>
diff --git a/modules/blocksearch/blocksearch.tpl b/modules/blocksearch/blocksearch.tpl
index d4dac74b7..ce9b45f74 100644
--- a/modules/blocksearch/blocksearch.tpl
+++ b/modules/blocksearch/blocksearch.tpl
@@ -32,7 +32,7 @@
 			<input type="hidden" name="controller" value="search" />
 			<input type="hidden" name="orderby" value="position" />
 			<input type="hidden" name="orderway" value="desc" />
-			<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
+			<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{Tools::htmlentitiesUTF8($smarty.get.search_query)|stripslashes}{/if}" />
 			<input type="submit" id="search_button" class="button_mini" value="{l s='Go!' mod='blocksearch'}" />
 		</p>
 	</form>
diff --git a/modules/blocksharefb/blocksharefb.php b/modules/blocksharefb/blocksharefb.php
index c34bd8b54..123d6f4e7 100644
--- a/modules/blocksharefb/blocksharefb.php
+++ b/modules/blocksharefb/blocksharefb.php
@@ -19,7 +19,8 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA

+*  @copyright  2007-2013 PrestaShop SA
+
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
@@ -63,7 +64,7 @@ class blocksharefb extends Module
 
 		if (isset($id_product) && $id_product != '')
 		{		
-			$product_infos = new Product((int)$id_product, true, $cookie->id_lang);
+			$product_infos = $this->context->controller->getProduct();
 			$smarty->assign(array(
 				'product_link' => urlencode($link->getProductLink($product_infos)),
 				'product_title' => urlencode($product_infos->name),
diff --git a/modules/blockspecials/blockspecials.php b/modules/blockspecials/blockspecials.php
index 9b18e083a..d517b7fae 100644
--- a/modules/blockspecials/blockspecials.php
+++ b/modules/blockspecials/blockspecials.php
@@ -99,7 +99,7 @@ class BlockSpecials extends Module
 			));
 		}
 
-		return $this->display(__FILE__, 'blockspecials.tpl', $this->getCacheId('blockspecials|'.$random));
+		return $this->display(__FILE__, 'blockspecials.tpl', (Configuration::get('BLOCKSPECIALS_NB_CACHES') ? $this->getCacheId('blockspecials|'.$random) : null));
 	}
 
 	public function hookLeftColumn($params)
diff --git a/modules/blockwishlist/managewishlist.php b/modules/blockwishlist/managewishlist.php
index 2a78abeaa..5dd8f8ff7 100644
--- a/modules/blockwishlist/managewishlist.php
+++ b/modules/blockwishlist/managewishlist.php
@@ -68,6 +68,11 @@ if ($context->customer->isLogged())
 						$combination_imgs = $obj->getCombinationImages($context->language->id);
 						if (isset($combination_imgs[$products[$i]['id_product_attribute']][0]))
 							$products[$i]['cover'] = $obj->id.'-'.$combination_imgs[$products[$i]['id_product_attribute']][0]['id_image'];
+						else 
+						{
+							$cover = Product::getCover($obj->id);
+							$products[$i]['cover'] = $obj->id.'-'.$cover['id_image'];
+						}
 					}
 					else
 					{
diff --git a/modules/blockwishlist/view.php b/modules/blockwishlist/view.php
index d4d880f6c..0d02e7b6d 100644
--- a/modules/blockwishlist/view.php
+++ b/modules/blockwishlist/view.php
@@ -62,6 +62,11 @@ if (empty($token) === false)
 				$combination_imgs = $obj->getCombinationImages($context->language->id);
 				if (isset($combination_imgs[$products[$i]['id_product_attribute']][0]))
 					$products[$i]['cover'] = $obj->id.'-'.$combination_imgs[$products[$i]['id_product_attribute']][0]['id_image'];
+				else 
+				{
+					$cover = Product::getCover($obj->id);
+					$products[$i]['cover'] = $obj->id.'-'.$cover['id_image'];
+				}
 			}
 			else
 			{
diff --git a/modules/crossselling/crossselling.php b/modules/crossselling/crossselling.php
index 181be60ba..81a6f3f65 100755
--- a/modules/crossselling/crossselling.php
+++ b/modules/crossselling/crossselling.php
@@ -99,6 +99,7 @@ class CrossSelling extends Module
 	{
 		$this->context->controller->addCSS(($this->_path).'crossselling.css', 'all');
 		$this->context->controller->addJS(($this->_path).'js/crossselling.js');
+		$this->context->controller->addJqueryPlugin(array('scrollTo', 'serialScroll'));
 	}
 
 	/**
@@ -303,4 +304,4 @@ class CrossSelling extends Module
 			'CROSSSELLING_DISPLAY_PRICE' => Tools::getValue('CROSSSELLING_DISPLAY_PRICE', Configuration::get('CROSSSELLING_DISPLAY_PRICE')),
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/dateofdelivery/dateofdelivery.php b/modules/dateofdelivery/dateofdelivery.php
index 33e86318e..956f316f7 100644
--- a/modules/dateofdelivery/dateofdelivery.php
+++ b/modules/dateofdelivery/dateofdelivery.php
@@ -200,8 +200,8 @@ class DateOfDelivery extends Module
 
 		$id_carrier = (int)OrderInvoice::getCarrierId($order_invoice->id);
 		$return = '';
-		if ($datesDelivery = $this->_getDatesOfDelivery($id_carrier, $oos, $order_invoice->date_add))
-			$return = sprintf($this->l('Approximate date of delivery is between %1$s and %2$s'), $datesDelivery[0], $datesDelivery[1]);
+		if (($datesDelivery = $this->_getDatesOfDelivery($id_carrier, $oos, $order_invoice->date_add)) && isset($datesDelivery[0][0]) && isset($datesDelivery[1][0]))
+			$return = sprintf($this->l('Approximate date of delivery is between %1$s and %2$s'), $datesDelivery[0][0], $datesDelivery[1][0]);
 
 		return $return;
 	}
diff --git a/modules/feeder/rss.php b/modules/feeder/rss.php
index caa32a3c8..046650c4e 100644
--- a/modules/feeder/rss.php
+++ b/modules/feeder/rss.php
@@ -26,6 +26,9 @@
 include(dirname(__FILE__).'/../../config/config.inc.php');
 require_once(dirname(__FILE__).'/../../init.php');
 
+if (!Module::getInstanceByName('feeder')->active)
+	exit;
+
 // Get data
 $number = ((int)(Tools::getValue('n')) ? (int)(Tools::getValue('n')) : 10);
 $orderBy = Tools::getProductsOrder('by', Tools::getValue('orderby'));
@@ -64,7 +67,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 		if (is_array($image) AND sizeof($image))
 		{
 			$imageObj = new Image($image[0]['id_image']);
-			echo "<![CDATA[<img src='"._PS_BASE_URL_._THEME_PROD_DIR_.$imageObj->getExistingImgPath()."-small_default.jpg' title='".str_replace('&', '', $product['name'])."' alt='thumb' />";
+			echo "<![CDATA[<img src='".$link->getImageLink($product['link_rewrite'], $image[0]['id_image'], 'small_default')."' title='".str_replace('&', '', $product['name'])."' alt='thumb' />";
 			$cdata = false;
 		}
 		if ($cdata)
@@ -76,4 +79,4 @@ echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 	}
 ?>
 	</channel>
-</rss>
+</rss>
\ No newline at end of file
diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php
index 3865e0531..2596d04a5 100644
--- a/modules/homeslider/homeslider.php
+++ b/modules/homeslider/homeslider.php
@@ -705,7 +705,7 @@ class HomeSlider extends Module
 					cursor: "move",
 					update: function() {
 						var order = $(this).sortable("serialize") + "&action=updateSlidesPosition";
-						$.post("'._PS_BASE_URL_.__PS_BASE_URI__.'modules/'.$this->name.'/ajax_'.$this->name.'.php?secure_key='.$this->secure_key.'", order);
+						$.post("'.$this->context->shop->physical_uri.$this->context->shop->virtual_uri.'modules/'.$this->name.'/ajax_'.$this->name.'.php?secure_key='.$this->secure_key.'", order);
 						}
 					});
 				$mySlides.hover(function() {
diff --git a/modules/loyalty/LoyaltyModule.php b/modules/loyalty/LoyaltyModule.php
index 4a10126fd..cb2c51974 100644
--- a/modules/loyalty/LoyaltyModule.php
+++ b/modules/loyalty/LoyaltyModule.php
@@ -88,7 +88,9 @@ class LoyaltyModule extends ObjectModel
 			$currentContext = Context::getContext();
 			$context = clone $currentContext;
 			$context->cart = $cart;
-			$context->customer = new Customer($context->cart->id_customer);
+			// if customer is logged we do not recreate it
+			if(!$context->customer->isLogged(true))
+				$context->customer = new Customer($context->cart->id_customer);
 			$context->language = new Language($context->cart->id_lang);
 			$context->shop = new Shop($context->cart->id_shop);
 			$context->currency = new Currency($context->cart->id_currency, null, $context->shop->id);
diff --git a/modules/mailalerts/config.xml b/modules/mailalerts/config.xml
index d01df2961..98984a992 100755
--- a/modules/mailalerts/config.xml
+++ b/modules/mailalerts/config.xml
@@ -2,7 +2,7 @@
         <module>
             <name>mailalerts</name>
             <displayName><![CDATA[Mail alerts]]></displayName>
-            <version><![CDATA[2.5]]></version>
+            <version><![CDATA[2.7]]></version>
             <description><![CDATA[Sends e-mail notifications to customers and merchants.]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[administration]]></tab>
diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php
index 266951c83..d723dfaa8 100644
--- a/modules/mailalerts/mailalerts.php
+++ b/modules/mailalerts/mailalerts.php
@@ -46,7 +46,7 @@ class MailAlerts extends Module
 	{
 		$this->name = 'mailalerts';
 		$this->tab = 'administration';
-		$this->version = '2.5';
+		$this->version = '2.7';
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
 
@@ -194,6 +194,21 @@ class MailAlerts extends Module
 		$this->init();
 	}
 
+	public function getAllMessages($id)
+	{
+		$messages = Db::getInstance()->executeS('
+			SELECT `message`
+			FROM `'._DB_PREFIX_.'message`
+			WHERE `id_order` = '.(int)$id.'
+			ORDER BY `id_message` ASC
+		');
+		$result = array();
+		foreach ($messages as $message) {
+			$result[] = $message['message'];
+		}
+		return implode('<br/>', $result);
+	}
+
 	public function hookActionValidateOrder($params)
 	{
 		if (!$this->_merchant_order || empty($this->_merchant_mails))
@@ -209,9 +224,9 @@ class MailAlerts extends Module
 		$configuration = Configuration::getMultiple(array('PS_SHOP_EMAIL', 'PS_MAIL_METHOD', 'PS_MAIL_SERVER', 'PS_MAIL_USER', 'PS_MAIL_PASSWD', 'PS_SHOP_NAME', 'PS_MAIL_COLOR'), $id_lang, null, $id_shop);
 		$delivery = new Address((int)$order->id_address_delivery);
 		$invoice = new Address((int)$order->id_address_invoice);
-		$order_date_text = Tools::displayDate($order->date_add, (int)$id_lang);
+		$order_date_text = Tools::displayDate($order->date_add);
 		$carrier = new Carrier((int)$order->id_carrier);
-		$message = $order->getFirstMessage();
+		$message = $this->getAllMessages($order->id);
 
 		if (!$message || empty($message))
 			$message = $this->l('No message');
@@ -315,6 +330,7 @@ class MailAlerts extends Module
 			'{total_products}' => Tools::displayPrice($order->getTotalProductsWithTaxes(), $currency),
 			'{total_discounts}' => Tools::displayPrice($order->total_discounts, $currency),
 			'{total_shipping}' => Tools::displayPrice($order->total_shipping, $currency),
+			'{total_tax_paid}' => Tools::displayPrice(($order->total_products_wt - $order->total_products) + ($order->total_shipping_tax_incl - $order->total_shipping_tax_excl), $currency, false),
 			'{total_wrapping}' => Tools::displayPrice($order->total_wrapping, $currency),
 			'{currency}' => $currency->sign,
 			'{message}' => $message
@@ -374,16 +390,20 @@ class MailAlerts extends Module
 	public function hookActionUpdateQuantity($params)
 	{
 		$id_product = (int)$params['id_product'];
+		$product = new Product($id_product);
+		$product_has_attributes = $product->hasAttributes();
 		$id_product_attribute = (int)$params['id_product_attribute'];
 		$quantity = (int)$params['quantity'];
 		$context = Context::getContext();
 		$id_shop = (int)$context->shop->id;
 		$id_lang = (int)$context->language->id;
 		$product = new Product($id_product, true, $id_lang, $id_shop, $context);
-		$configuration = Configuration::getMultiple(array('MA_LAST_QTIES', 'PS_STOCK_MANAGEMENT', 'PS_SHOP_EMAIL', 'PS_SHOP_NAME'), $id_lang, null, $id_shop);
+		$configuration = Configuration::getMultiple(array('MA_LAST_QTIES', 'PS_STOCK_MANAGEMENT', 'PS_SHOP_EMAIL', 'PS_SHOP_NAME'), null, null, $id_shop);
 		$ma_last_qties = (int)$configuration['MA_LAST_QTIES'];
-
-		if ($product->active == 1 && (int)$quantity <= $ma_last_qties && !(!$this->_merchant_oos || empty($this->_merchant_mails)) && $configuration['PS_STOCK_MANAGEMENT'])
+		
+		$check_oos = ($product_has_attributes && $id_product_attribute) || (!$product_has_attributes && !$id_product_attribute);
+		
+		if ($check_oos && $product->active == 1 && (int)$quantity <= $ma_last_qties && !(!$this->_merchant_oos || empty($this->_merchant_mails)) && $configuration['PS_STOCK_MANAGEMENT'])
 		{
 			$iso = Language::getIsoById($id_lang);
 			$product_name = Product::getProductName($id_product, $id_product_attribute, $id_lang);
@@ -662,8 +682,7 @@ class MailAlerts extends Module
 						'type' => 'textarea',
 						'label' => $this->l('E-mail addresses:'),
 						'name' => 'MA_MERCHANT_MAILS',
-						'desc' => $this->l('One e-mail address per line (e.g. bob@example.com)
-'),
+						'desc' => $this->l('One e-mail address per line (e.g. bob@example.com)'),
 					),
 				),
 			'submit' => array(
@@ -707,4 +726,4 @@ class MailAlerts extends Module
 			'MA_MERCHANT_MAILS' => Tools::getValue('MA_MERCHANT_MAILS', Configuration::get('MA_MERCHANT_MAILS')),
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/productcomments/productcomments.php b/modules/productcomments/productcomments.php
index b5b22444b..20f8d74ba 100644
--- a/modules/productcomments/productcomments.php
+++ b/modules/productcomments/productcomments.php
@@ -561,7 +561,7 @@ class ProductComments extends Module
 					<div class="margin-form">
 ">
 						<select name="id_product_comment_criterion" id="id_product_comment_criterion" onchange="window.location=\''.Tools::safeOutput($this->_baseUrl).'&updateCriterion=\'+$(\'#id_product_comment_criterion option:selected\').val()">
-							<option value="--">-- '.$this->l('Choose a criterion').' --</option>';
+							<option value="-">- '.$this->l('Choose a criterion').' -</option>';
 						foreach ($criterions as $foo)
 								$this->_html .= '<option value="'.(int)($foo['id_product_comment_criterion']).'" '.($foo['id_product_comment_criterion'] == $id_criterion ? 'selected="selected"' : '').'>'.$foo['name'].'</option>';
 			$this->_html .= '</select>
@@ -705,7 +705,7 @@ class ProductComments extends Module
 
 		$this->context->smarty->assign(array(
 			'id_product_comment_form' => (int)Tools::getValue('id_product'),
-			'product' => new Product((int)Tools::getValue('id_product'), false, $this->context->language->id),
+			'product' => $this->context->controller->getProduct(),
 			'secure_key' => $this->secure_key,
 			'logged' => (int)$this->context->customer->isLogged(true),
 			'allow_guests' => (int)Configuration::get('PRODUCT_COMMENTS_ALLOW_GUESTS'),
diff --git a/modules/productscategory/productscategory.php b/modules/productscategory/productscategory.php
index eca12f57a..88122d9ca 100644
--- a/modules/productscategory/productscategory.php
+++ b/modules/productscategory/productscategory.php
@@ -174,7 +174,7 @@ class productsCategory extends Module
 	{
 		$this->context->controller->addCSS($this->_path.'productscategory.css', 'all');
 		$this->context->controller->addJS($this->_path.'productscategory.js');
-		$this->context->controller->addJqueryPlugin('serialScroll');
+		$this->context->controller->addJqueryPlugin(array('scrollTo', 'serialScroll'));
 	}
 
 	public function hookAddProduct($params)
diff --git a/modules/productscategory/productscategory.tpl b/modules/productscategory/productscategory.tpl
index 8b9b9f6cb..409c21e30 100644
--- a/modules/productscategory/productscategory.tpl
+++ b/modules/productscategory/productscategory.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{if count($categoryProducts) > 0 && $categoryProducts !== false}
+{if isset($categoryProducts) && count($categoryProducts) > 0 && $categoryProducts !== false}
 <div class="clearfix blockproductscategory">
 	<h2 class="productscategory_h2">{$categoryProducts|@count} {l s='other products in the same category:' mod='productscategory'}</h2>
 	<div id="{if count($categoryProducts) > 5}productscategory{else}productscategory_noscroll{/if}">
diff --git a/modules/pscleaner/pscleaner.php b/modules/pscleaner/pscleaner.php
index c1597a953..503fd55f2 100644
--- a/modules/pscleaner/pscleaner.php
+++ b/modules/pscleaner/pscleaner.php
@@ -117,7 +117,7 @@ class PSCleaner extends Module
 		// Remove inexisting or monolanguage configuration value from configuration_lang
 		$query = 'DELETE FROM `'._DB_PREFIX_.'configuration_lang`
 		WHERE `id_configuration` NOT IN (SELECT `id_configuration` FROM `'._DB_PREFIX_.'configuration`)
-		OR `id_configuration` IN (SELECT `id_configuration` FROM `'._DB_PREFIX_.'configuration` WHERE name IS NOT NULL AND name != "")';
+		OR `id_configuration` IN (SELECT `id_configuration` FROM `'._DB_PREFIX_.'configuration` WHERE name IS NULL OR name = "")';
 		if ($db->Execute($query))
 			if ($affected_rows = $db->Affected_Rows())
 				$logs[$query] = $affected_rows;
@@ -266,8 +266,6 @@ class PSCleaner extends Module
 			array('stock', 'id_warehouse', 'warehouse', 'id_warehouse'),
 			array('stock', 'id_product', 'product', 'id_product'),
 			array('stock_available', 'id_product', 'product', 'id_product'),
-			array('stock_available', 'id_shop', 'shop', 'id_shop'),
-			array('stock_available', 'id_shop_group', 'shop_group', 'id_shop_group'),
 			array('stock_mvt', 'id_stock', 'stock', 'id_stock'),
 			array('tab_module_preference', 'id_employee', 'employee', 'id_employee'),
 			array('tab_module_preference', 'id_tab', 'tab', 'id_tab'),
@@ -333,7 +331,13 @@ class PSCleaner extends Module
 				if ($affected_rows = $db->Affected_Rows())
 					$logs[$query] = $affected_rows;
 		}
-		
+
+		// stock_available
+		$query = 'DELETE FROM `'._DB_PREFIX_.'stock_available` WHERE `id_shop` NOT IN (SELECT `id_shop` FROM `'._DB_PREFIX_.'shop`) AND `id_shop_group` NOT IN (SELECT `id_shop_group` FROM `'._DB_PREFIX_.'shop_group`)';
+		if ($db->Execute($query))
+			if ($affected_rows = $db->Affected_Rows())
+				$logs[$query] = $affected_rows;
+
 		Category::regenerateEntireNtree();
 
 		// @Todo: Remove attachment files, images...
@@ -605,4 +609,4 @@ class PSCleaner extends Module
 	{
 		return array('value' => '');
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/referralprogram/controllers/front/program.php b/modules/referralprogram/controllers/front/program.php
index 2b4d04dcd..68cf153b1 100755
--- a/modules/referralprogram/controllers/front/program.php
+++ b/modules/referralprogram/controllers/front/program.php
@@ -183,6 +183,8 @@ class ReferralprogramProgramModuleFrontController extends ModuleFrontController
 
 		if ((int)($stats['nb_orders']) >= $orderQuantity)
 			$canSendInvitations = true;
+		
+		$discountInPercent = Tools::getValue('discount_type', Configuration::get('REFERRAL_DISCOUNT_TYPE')) == 1;
 
 		// Smarty display
 		$this->context->smarty->assign(array(
@@ -199,7 +201,7 @@ class ReferralprogramProgramModuleFrontController extends ModuleFrontController
 			'nbRevive' => $nbRevive,
 			'subscribeFriends' => ReferralProgramModule::getSponsorFriend((int)($this->context->customer->id), 'subscribed'),
 			'mails_exists' => (isset($mails_exists) ? $mails_exists : array()),
-			'currencySign' => $this->context->currency->sign
+			'currencySign' => ($discountInPercent ? '%' : $this->context->currency->sign)
 		));
 		$this->setTemplate('program.tpl');
 	}
diff --git a/modules/statsstock/statsstock.php b/modules/statsstock/statsstock.php
index c3752dd05..7d4089832 100644
--- a/modules/statsstock/statsstock.php
+++ b/modules/statsstock/statsstock.php
@@ -84,6 +84,7 @@ class StatsStock extends Module
 
 		$this->html .= '
 		<script type="text/javascript">$(\'#calendar\').slideToggle();</script>
+
 		<div class="panel-heading">'
 			.$this->l('Evaluation of available quantities for sale.').
 		'</div>
@@ -92,7 +93,7 @@ class StatsStock extends Module
 				<label class="control-label col-lg-3">'.$this->l('Category').'</label>
 				<div class="col-lg-6">
 					<select name="statsstock_id_category" onchange="this.form.submit();">
-						<option value="0">-- '.$this->l('All').' --</option>';
+						<option value="0">- '.$this->l('All').' -</option>';
 				foreach (Category::getSimpleCategories($this->context->language->id) as $category)
 					$this->html .= '<option value="'.(int)$category['id_category'].'" '.
 						($this->context->cookie->statsstock_id_category == $category['id_category'] ? 'selected="selected"' : '').'>'.
diff --git a/modules/watermark/config.xml b/modules/watermark/config.xml
index 6a733cb88..2e27d8aa6 100755
--- a/modules/watermark/config.xml
+++ b/modules/watermark/config.xml
@@ -6,7 +6,7 @@
             <description><![CDATA[Protect image by watermark.]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[administration]]></tab>
-	<confirmUninstall>Are you sure you want to delete your details ?</confirmUninstall>
+	<confirmUninstall>Are you sure you want to delete these details?</confirmUninstall>
             <is_configurable>1</is_configurable>
             <need_instance>1</need_instance>
 	<limited_countries></limited_countries>
diff --git a/pdf/invoice-b2b.tpl b/pdf/invoice-b2b.tpl
index 0fc86cba0..6f7ba9462 100755
--- a/pdf/invoice-b2b.tpl
+++ b/pdf/invoice-b2b.tpl
@@ -151,7 +151,7 @@
 					<td style="text-align: right; width: 10%">
                     {if (isset($order_detail.reduction_amount) && $order_detail.reduction_amount > 0)}
                         -{displayPrice currency=$order->id_currency price=$order_detail.reduction_amount}
-                    {else if (isset($order_detail.reduction_percent) && $order_detail.reduction_percent > 0)}
+                    {elseif (isset($order_detail.reduction_percent) && $order_detail.reduction_percent > 0)}
                         -{$order_detail.reduction_percent}%
                     {else}
                     --
@@ -289,4 +289,4 @@
 </table>
 {/if}
 
-</div>
\ No newline at end of file
+</div>
diff --git a/pdf/invoice.tpl b/pdf/invoice.tpl
index 1f48322ce..918cdb15d 100755
--- a/pdf/invoice.tpl
+++ b/pdf/invoice.tpl
@@ -147,7 +147,7 @@
 					<td style="text-align: right; width: 10%">
 					{if (isset($order_detail.reduction_amount) && $order_detail.reduction_amount > 0)}
 						-{displayPrice currency=$order->id_currency price=$order_detail.reduction_amount}
-					{else if (isset($order_detail.reduction_percent) && $order_detail.reduction_percent > 0)}
+					{elseif (isset($order_detail.reduction_percent) && $order_detail.reduction_percent > 0)}
 						-{$order_detail.reduction_percent}%
 					{else}
 					--
diff --git a/themes/default/address.tpl b/themes/default/address.tpl
index 263d3465e..f0eda9ae8 100644
--- a/themes/default/address.tpl
+++ b/themes/default/address.tpl
@@ -94,8 +94,8 @@ $(function(){ldelim}
 			<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{else}{if isset($address->dni)}{$address->dni|escape:'html'}{/if}{/if}" />
 			<span class="form_info">{l s='DNI / NIF / NIE'}</span>
 		</p>
-	{assign var="stateExist" value="false"}
-	{assign var="postCodeExist" value="false"}
+	{assign var="stateExist" value=false}
+	{assign var="postCodeExist" value=false}
 	{foreach from=$ordered_adr_fields item=field_name}
 		{if $field_name eq 'company'}
 		<p class="text">
@@ -142,7 +142,7 @@ $(function(){ldelim}
 		</p>
 		{/if}
 		{if $field_name eq 'postcode'}
-		{assign var="postCodeExist" value="true"}
+		{assign var="postCodeExist" value=true}
 		<p class="required postcode text">
 			<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
 			<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase()); if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).css('background-color', '#DFF0D8'); else $(this).css('background-color', '#F2DEDE');" />
@@ -192,7 +192,7 @@ $(function(){ldelim}
 		{/if}
 		{/if}
 		{if $field_name eq 'State:name'}
-		{assign var="stateExist" value="true"}
+		{assign var="stateExist" value=true}
 		<p class="required id_state select">
 			<label for="id_state">{l s='State'} <sup>*</sup></label>
 			<select name="id_state" id="id_state">
@@ -201,14 +201,14 @@ $(function(){ldelim}
 		</p>
 		{/if}
 		{/foreach}
-		{if $postCodeExist eq "false"}
+		{if !$postCodeExist}
 		<p class="required postcode text hidden">
 			<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
 			<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());"
 				onkeyup="if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).css('background-color', '#DFF0D8'); else $(this).css('background-color', '#F2DEDE');" />
 		</p>
 		{/if}		
-		{if $stateExist eq "false"}
+		{if !$stateExist}
 		<p class="required id_state select">
 			<label for="id_state">{l s='State'} <sup>*</sup></label>
 			<select name="id_state" id="id_state">
diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index a4371c698..b8bdf025d 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -53,23 +53,34 @@ var countriesNeedZipCode = new Array();
 		{/if}
 	{/foreach}
 {/if}
-$(function(){ldelim}
-	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address)}{$address->id_state|intval}{/if}{/if}]').attr('selected', true);
-{rdelim});
 //]]>
 {literal}
 $(document).ready(function() {
 	$('#company').on('input',function(){
 		vat_number();
 	});
-	vat_number();
+	$('#company_invoice').on('input',function(){
+		vat_number_invoice();
+	});
 	function vat_number()
 	{
-		if ($('#company').val() != '')
+		if (($('#company').length) && ($('#company').val() != '')) 
 			$('#vat_number').show();
 		else
 			$('#vat_number').hide();
 	}
+	function vat_number_invoice()
+	{
+		if (($('#company_invoice').length) && ($('#company_invoice').val() != '')) 
+			$('#vat_number_block_invoice').show();
+		else
+			$('#vat_number_block_invoice').hide();
+	}
+	vat_number();
+	vat_number_invoice();
+{/literal}
+	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{/if}]').prop('selected', true);
+{literal}
 });
 {/literal}
 </script>
@@ -90,6 +101,10 @@ $(document).ready(function() {
 			submitFunction();
 			return false;
 		});
+		$('#invoice_address').click(function() {
+			bindCheckbox();
+		});
+		bindCheckbox();
 	});
 	function submitFunction()
 	{
@@ -140,6 +155,24 @@ $(document).ready(function() {
 			}
 		});
 	}
+	function bindCheckbox()
+	{
+		if ($('#invoice_address:checked').length > 0)
+		{
+			$('#opc_invoice_address').slideDown('slow');
+			if ($('#company_invoice').val() == '')
+				$('#vat_number_block_invoice').hide();
+			updateState('invoice');
+			updateNeedIDNumber('invoice');
+			updateZipCode('invoice');
+{/literal}
+			$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{/if}]').prop('selected', true);
+			$('.id_state_invoice option[value={if isset($smarty.post.id_state_invoice)}{$smarty.post.id_state_invoice|intval}{/if}]').prop('selected', true);
+{literal}
+		}
+		else
+			$('#opc_invoice_address').slideUp('slow');
+	}
 	{/literal}
 	</script>
 	<!--{if isset($authentification_error)}
@@ -167,7 +200,7 @@ $(document).ready(function() {
 					<span><input type="text" id="email_create" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|stripslashes}{/if}" class="account_input" /></span>
 				</p>
 				<p class="submit">
-					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back}" />{/if}
 					<input type="submit" id="SubmitCreate" name="SubmitCreate" class="button_large" value="{l s='Create an account'}" />
 					<input type="hidden" class="hidden" name="SubmitCreate" value="{l s='Create an account'}" />
 				</p>
@@ -270,30 +303,35 @@ $(document).ready(function() {
 				{/if}
 				<h3>{l s='Delivery address'}</h3>
 				{foreach from=$dlv_all_fields item=field_name}
-					{if $field_name eq "company"}
+					{if $field_name eq "company" && $b2b_enable}
 						<p class="text">
 							<label for="company">{l s='Company'}</label>
 							<input type="text" class="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" />
 						</p>
-						{elseif $field_name eq "vat_number"}
+					{elseif $field_name eq "vat_number"}
 						<div id="vat_number" style="display:none;">
 							<p class="text">
 								<label for="vat_number">{l s='VAT number'}</label>
 								<input type="text" class="text" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{/if}" />
 							</p>
 						</div>
-						{elseif $field_name eq "address1"}
+						<p class="required text dni">
+							<label for="dni">{l s='Identification number'}</label>
+							<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
+							<span class="form_info">{l s='DNI / NIF / NIE'}</span>
+						</p>
+					{elseif $field_name eq "address1"}
 						<p class="required text">
 							<label for="address1">{l s='Address'} <sup>*</sup></label>
 							<input type="text" class="text" name="address1" id="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{/if}" />
 						</p>
-						{elseif $field_name eq "postcode"}
-						{assign var='postCodeExist' value=true}
+					{elseif $field_name eq "postcode"}
+					{assign var='postCodeExist' value=true}
 						<p class="required postcode text">
 							<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
 							<input type="text" class="text" name="postcode" id="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{/if}" onblur="$('#postcode').val($('#postcode').val().toUpperCase());" />
 						</p>
-						{elseif $field_name eq "city"}
+					{elseif $field_name eq "city"}
 						<p class="required text">
 							<label for="city">{l s='City'} <sup>*</sup></label>
 							<input type="text" class="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" />
@@ -302,16 +340,16 @@ $(document).ready(function() {
 							   if customer hasn't update his layout address, country has to be verified
 							   but it's deprecated
 						   -->
-						{elseif $field_name eq "Country:name" || $field_name eq "country"}
+					{elseif $field_name eq "Country:name" || $field_name eq "country"}
 						<p class="required select">
 							<label for="id_country">{l s='Country'} <sup>*</sup></label>
 							<select name="id_country" id="id_country">
 								{foreach from=$countries item=v}
-									<option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name}</option>
+									<option value="{$v.id_country}"{if (isset($smarty.post.id_country) AND  $smarty.post.id_country == $v.id_country) OR (!isset($smarty.post.id_country) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name}</option>
 								{/foreach}
 							</select>
 						</p>
-						{elseif $field_name eq "State:name"}
+					{elseif $field_name eq "State:name"}
 						{assign var='stateExist' value=true}
 						<p class="required id_state select">
 							<label for="id_state">{l s='State'} <sup>*</sup></label>
@@ -319,11 +357,6 @@ $(document).ready(function() {
 								<option value="">-</option>
 							</select>
 						</p>
-						{elseif $field_name eq "phone"}
-						<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
-							<label for="phone">{l s='Phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
-							<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}"/>
-						</p>
 					{/if}
 				{/foreach}
 				{if $stateExist eq false}
@@ -340,19 +373,106 @@ $(document).ready(function() {
 						<input type="text" class="text" name="postcode" id="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{/if}" onblur="$('#postcode').val($('#postcode').val().toUpperCase());" />
 					</p>
 				{/if}
+				<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
+					<label for="phone_mobile">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
+					<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" />
+				</p>
 				<input type="hidden" name="alias" id="alias" value="{l s='My address'}" />
 				<input type="hidden" name="is_new_customer" id="is_new_customer" value="0" />
-				<!-- END Account -->
+				<p class="checkbox">
+					<input type="checkbox" name="invoice_address" id="invoice_address"{if isset($smarty.post.invoice_address) && $smarty.post.invoice_address} checked="checked"{/if} autocomplete="off"/>
+					<label for="invoice_address"><b>{l s='Please use another address for invoice'}</b></label>
+				</p>
+				<div id="opc_invoice_address" class="hidden">
+					{assign var=stateExist value=false}
+					{assign var=postCodeExist value=false}
+					<h3>{l s='Invoice address'}</h3>
+					{foreach from=$inv_all_fields item=field_name}
+					{if $field_name eq "company" &&  $b2b_enable}
+					<p class="text">
+						<label for="company_invoice">{l s='Company'}</label>
+						<input type="text" class="text" id="company_invoice" name="company_invoice" value="{if isset($smarty.post.company_invoice)}{$smarty.post.company_invoice}{/if}" />
+					</p>
+					{elseif $field_name eq "vat_number"}
+					<div id="vat_number_block_invoice" class="hidden">
+						<p class="text">
+							<label for="vat_number_invoice">{l s='VAT number'}</label>
+							<input type="text" class="text" id="vat_number_invoice" name="vat_number_invoice" value="{if isset($smarty.post.vat_number_invoice)}{$smarty.post.vat_number_invoice}{/if}" />
+						</p>
+					</div>
+					<p class="required text dni_invoice">
+						<label for="dni">{l s='Identification number'}</label>
+						<input type="text" class="text" name="dni_invoice" id="dni_invoice" value="{if isset($smarty.post.dni_invoice)}{$smarty.post.dni_invoice}{/if}" />
+						<span class="form_info">{l s='DNI / NIF / NIE'}</span>
+					</p>
+					{elseif $field_name eq "firstname"}
+					<p class="required text">
+						<label for="firstname_invoice">{l s='First name'} <sup>*</sup></label>
+						<input type="text" class="text" id="firstname_invoice" name="firstname_invoice" value="{if isset($smarty.post.firstname_invoice)}{$smarty.post.firstname_invoice}{/if}" />
+					</p>
+					{elseif $field_name eq "lastname"}
+					<p class="required text">
+						<label for="lastname_invoice">{l s='Last name'} <sup>*</sup></label>
+						<input type="text" class="text" id="lastname_invoice" name="lastname_invoice" value="{if isset($smarty.post.firstname_invoice)}{$smarty.post.firstname_invoice}{/if}" />
+					</p>
+					{elseif $field_name eq "address1"}
+					<p class="required text">
+						<label for="address1_invoice">{l s='Address'} <sup>*</sup></label>
+						<input type="text" class="text" name="address1_invoice" id="address1_invoice" value="{if isset($smarty.post.address1_invoice)}{$smarty.post.address1_invoice}{/if}" />
+					</p>
+					{elseif $field_name eq "postcode"}
+					{$postCodeExist = true}
+					<p class="required postcode_invoice text">
+						<label for="postcode_invoice">{l s='Zip / Postal Code'} <sup>*</sup></label>
+						<input type="text" class="text" name="postcode_invoice" id="postcode_invoice" value="{if isset($smarty.post.postcode_invoice)}{$smarty.post.postcode_invoice}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
+					</p>
+					{elseif $field_name eq "city"}
+					<p class="required text">
+						<label for="city_invoice">{l s='City'} <sup>*</sup></label>
+						<input type="text" class="text" name="city_invoice" id="city_invoice" value="{if isset($smarty.post.city_invoice)}{$smarty.post.city_invoice}{/if}" />
+					</p>
+					{elseif $field_name eq "country" || $field_name eq "Country:name"}
+					<p class="required select">
+						<label for="id_country_invoice">{l s='Country'} <sup>*</sup></label>
+						<select name="id_country_invoice" id="id_country_invoice">
+							<option value="">-</option>
+							{foreach from=$countries item=v}
+							<option value="{$v.id_country}"{if (isset($smarty.post.id_country_invoice) && $smarty.post.id_country_invoice == $v.id_country) OR (!isset($smarty.post.id_country_invoice) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
+							{/foreach}
+						</select>
+					</p>
+					{elseif $field_name eq "state" || $field_name eq 'State:name'}
+					{$stateExist = true}
+					<p class="required id_state_invoice select" style="display:none;">
+						<label for="id_state_invoice">{l s='State'} <sup>*</sup></label>
+						<select name="id_state_invoice" id="id_state_invoice">
+							<option value="">-</option>
+						</select>
+					</p>
+					{/if}
+					{/foreach}
+					{if !$postCodeExist}
+					<p class="required postcode_invoice text hidden">
+						<label for="postcode_invoice">{l s='Zip / Postal Code'} <sup>*</sup></label>
+						<input type="text" class="text" name="postcode_invoice" id="postcode_invoice" value="{if isset($smarty.post.postcode_invoice)}{$smarty.post.postcode_invoice}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
+					</p>
+					{/if}					
+					{if !$stateExist}
+					<p class="required id_state_invoice select hidden">
+						<label for="id_state_invoice">{l s='State'} <sup>*</sup></label>
+						<select name="id_state_invoice" id="id_state_invoice">
+							<option value="">-</option>
+						</select>
+					</p>
+					{/if}
+					<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
+						<label for="phone_mobile_invoice">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
+						<input type="text" class="text" name="phone_mobile_invoice" id="phone_mobile_invoice" value="{if isset($smarty.post.phone_mobile_invoice)}{$smarty.post.phone_mobile_invoice}{/if}" />
+					</p>
+					<input type="hidden" name="alias_invoice" id="alias_invoice" value="{l s='My Invoice address'}" />
+				</div>
 			</div>
 		</fieldset>
-		<fieldset class="account_creation dni">
-			<h3>{l s='Tax identification'}</h3>
-			<p class="required text">
-				<label for="dni">{l s='Identification number'}</label>
-				<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
-				<span class="form_info">{l s='DNI / NIF / NIE'}</span>
-			</p>
-		</fieldset>
 		{$HOOK_CREATE_ACCOUNT_FORM}
 		<p class="cart_navigation required submit">
 			<span><sup>*</sup>{l s='Required field'}</span>
@@ -532,7 +652,7 @@ $(document).ready(function() {
 					<select name="id_country" id="id_country">
 						<option value="">-</option>
 						{foreach from=$countries item=v}
-						<option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name}</option>
+						<option value="{$v.id_country}"{if (isset($smarty.post.id_country) AND $smarty.post.id_country == $v.id_country) OR (!isset($smarty.post.id_country) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name}</option>
 						{/foreach}
 					</select>
 				</p>
@@ -565,13 +685,13 @@ $(document).ready(function() {
 			<textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea>
 		</p>
 		{if isset($one_phone_at_least) && $one_phone_at_least}
-			<p class="inline-infos">{l s='You must register at least one phone number.'}</p>
-		{/if}
+			<p class="inline-infos required">{l s='You must register at least one phone number.'}</p>
+		{/if}								
 		<p class="text">
 			<label for="phone">{l s='Home phone'}</label>
 			<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}" />
 		</p>
-		<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if} text">
+		<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
 			<label for="phone_mobile">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
 			<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" />
 		</p>
diff --git a/themes/default/css/product_list.css b/themes/default/css/product_list.css
index d0f8d83bf..e5fb9dec3 100644
--- a/themes/default/css/product_list.css
+++ b/themes/default/css/product_list.css
@@ -1,167 +1,148 @@
 ul#product_list {
 	list-style-type: none
 }
-	#product_list li {
-		margin-bottom: 14px;
-		padding: 12px 8px;
-		border: 1px solid #eee;
-		-moz-border-radius: 3px;
-		-webkit-border-radius: 3px;
-		border-radius: 3px
-	}
-		#product_list li a {
-			color: #374853;
-			text-decoration: none
-		}
-
+#product_list li {
+	margin-bottom: 14px;
+	padding: 12px 8px;
+	border: 1px solid #eee;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px
+}
+#product_list li a {
+	color: #374853;
+	text-decoration: none
+}
 #product_list li .left_block {
 	float:left;
 	padding-top:58px;
 	width:15px
 }
-	#product_list li .left_block  .compare label {display:none;}
-
-		#product_list li p.compare input {
-			vertical-align: text-bottom
-		}
+#product_list li .left_block  .compare label {display:none;}
 
+#product_list li p.compare input {
+	vertical-align: text-bottom
+}
 #product_list li .center_block {
    float: left;
 	padding:0 7px;
    width: 342px;/* 356 */
 	border-right:1px dotted #ccc
 }
-	#product_list a.product_img_link {
-		overflow:hidden;
-		position:relative;
-		float: left;
-		display:block;
-		margin-right: 14px;
-		border: 1px solid #ccc
-	}
-		#product_list a.product_img_link img {
-			display: block;
-			vertical-align: bottom
-		}
-		#product_list li span.new {
-			display: block;
-			position: absolute;
-			top: 15px;
-			right:-30px;
-			padding: 1px 4px;
-			width: 101px;
-			font-size:10px;
-			color: #fff;
-			text-align: center;
-			text-transform: uppercase;
-			-moz-transform: rotate(45deg);
-			-webkit-transform: rotate(45deg);
-			-o-transform:rotate(45deg);
-			background-color: #990000;
-			transform: rotate(45deg); 
-			-ms-transform: rotate(45deg);			/* Newer browsers */
-		}
-		
-		.ie8 #product_list li span.new{top:111px;right:0;width:94%}
-		.ie7 #product_list li span.new {top:111px;right:0;width:94%}
-	#product_list li h3 {
-		padding:0 0 10px 0;
-		font-size:13px;
-		color:#000
-	}
-		#product_list li a {
-			color: #000;
-			text-decoration: none;
-		}
+#product_list a.product_img_link {
+	overflow:hidden;
+	position:relative;
+	float: left;
+	display:block;
+	margin-right: 14px;
+	border: 1px solid #ccc
+}
+#product_list a.product_img_link img {
+	display: block;
+	vertical-align: bottom
+}
+#product_list li span.new {
+	display: block;
+	position: absolute;
+	top: 15px;
+	right:-30px;
+	padding: 1px 4px;
+	width: 101px;
+	font-size:10px;
+	color: #fff;
+	text-align: center;
+	text-transform: uppercase;
+	-moz-transform: rotate(45deg);
+	-webkit-transform: rotate(45deg);
+	-o-transform:rotate(45deg);
+	background-color: #990000;
+	transform: rotate(45deg); 
+	-ms-transform: rotate(45deg);			/* Newer browsers */
+}
 
-	#product_list li p.product_desc {
-		overflow: hidden;
-		padding:0;
-		line-height:16px;
-	}
-	#product_list li p.product_desc,
-	#product_list li p.product_desc a {
-		color:#666;
-	}
+.ie8 #product_list li span.new{top:111px;right:0;width:94%}
+.ie7 #product_list li span.new {top:111px;right:0;width:94%}
+#product_list li h3 {
+	padding:0 0 10px 0;
+	font-size:13px;
+	color:#000
+}
+#product_list li a {
+	color: #000;
+	text-decoration: none;
+}
+#product_list li p.product_desc {
+	overflow: hidden;
+	padding:0;
+	line-height:16px;
+}
+#product_list li p.product_desc,
+#product_list li p.product_desc a {
+	color:#666;
+}
 
 #product_list li .right_block {
-	position:relative;
-   float: left;
-   width: 145px;
-   text-align: right
+position:relative;
+float: left;
+width: 145px;
+text-align: right
 }
-	#product_list li .discount, ul#product_list li .on_sale, ul#product_list li .online_only {
-		display: block;
-		font-weight: bold;
-		color: #990000;
-		text-transform: uppercase
-	}
-	#product_list li .discount {
-		position:absolute;
-		top:0;
-		right:0;
-		display: inline-block;
-		font-weight: bold;
-		padding: 1px 5px;
-		font-size: 10px;
-		color: #fff;
-		text-transform: uppercase;
-		background: none repeat scroll 0 0 #9B0000
-	}
-	#product_list li .online_only {
-		margin:0 0 10px 0
-	}
-	#product_list li .content_price {
-		margin:26px 0 15px 0;
-	}
-	#product_list li .price {
-		display: block;
-		margin-bottom: 15px;
-		font-weight:bold;
-		font-size: 18px;
-		color:#990000
-	}
-	#product_list li span.availability {
-			color: #488C40
-	}
-	#product_list li .ajax_add_to_cart_button {
-		padding-left: 20px
-	}
-	#product_list li .ajax_add_to_cart_button span {
-		display: block;
-		position: absolute;
-		top: -1px;
-		left: -12px;
-		height: 26px;
-		width: 26px;
-		background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
-	}
-	#product_list li .lnk_view {
-		display: block;
-		margin-top:15px;
-		padding:0 10px;
-		border:none;
-		font-weight:bold;
-		color:#0088CC;
-		background:url(../img/arrow_right_1.png) no-repeat 100% 4px transparent
-	}
-	#product_list li .lnk_view:hover {text-decoration:underline}
-
-	#color_to_pick_list {
-		list-style-type:none;
-		width:125px;
-		float:left;
-	}
-
-	#color_to_pick_list li {
-		float:left;
-		clear:none;
-		padding:0;
-		margin-bottom:1px;
-	}
-
-	#color_to_pick_list li a {
-		display:block;
-		height:20px;
-		width:20px;
-	}
+#product_list li .discount, ul#product_list li .on_sale, ul#product_list li .online_only {
+	display: block;
+	font-weight: bold;
+	color: #990000;
+	text-transform: uppercase
+}
+#product_list li .discount {
+	position:absolute;
+	top:0;
+	right:0;
+	display: inline-block;
+	font-weight: bold;
+	padding: 1px 5px;
+	font-size: 10px;
+	color: #fff;
+	text-transform: uppercase;
+	background: none repeat scroll 0 0 #9B0000
+}
+#product_list li .online_only {
+	margin:0 0 10px 0
+}
+#product_list li .content_price {
+	margin:26px 0 15px 0;
+}
+#product_list li .price {
+	display: block;
+	margin-bottom: 15px;
+	font-weight:bold;
+	font-size: 18px;
+	color:#990000
+}
+#product_list li span.availability {
+	color: #488C40
+}
+#product_list li span.warning_inline {
+	color: red
+}
+#product_list li .ajax_add_to_cart_button {
+	padding-left: 20px
+}
+#product_list li .ajax_add_to_cart_button span {
+	display: block;
+	position: absolute;
+	top: -1px;
+	left: -12px;
+	height: 26px;
+	width: 26px;
+	background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
+}
+#product_list li .lnk_view {
+	display: block;
+	margin-top:15px;
+	padding:0 10px;
+	border:none;
+	font-weight:bold;
+	color:#0088CC;
+	background:url(../img/arrow_right_1.png) no-repeat 100% 4px transparent
+}
+#product_list li .lnk_view:hover {text-decoration:underline}
\ No newline at end of file
diff --git a/themes/default/js/order-opc.js b/themes/default/js/order-opc.js
index 6480375fb..cbfb44f9c 100644
--- a/themes/default/js/order-opc.js
+++ b/themes/default/js/order-opc.js
@@ -308,7 +308,7 @@ function saveAddress(type)
 	params += 'address2='+encodeURIComponent($('#address2'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
 	params += 'postcode='+encodeURIComponent($('#postcode'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
 	params += 'city='+encodeURIComponent($('#city'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
-	params += 'id_country='+encodeURIComponent($('#id_country').val())+'&';
+	params += 'id_country='+encodeURIComponent($('#id_country'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
 	if ($('#id_state'+(type == 'invoice' ? '_invoice' : '')).val())
 		params += 'id_state='+encodeURIComponent($('#id_state'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
 	params += 'other='+encodeURIComponent($('#other'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
diff --git a/themes/default/js/product.js b/themes/default/js/product.js
index 2cff98d95..dc122d166 100644
--- a/themes/default/js/product.js
+++ b/themes/default/js/product.js
@@ -417,14 +417,20 @@ function displayImage(domAAroundImgThumb, no_animation)
 {
 	if (typeof(no_animation) == 'undefined')
 		no_animation = false;
-	if (domAAroundImgThumb.attr('href'))
+	if (domAAroundImgThumb.prop('href'))
 	{
-		var newSrc = domAAroundImgThumb.attr('href').replace('thickbox', 'large');
-		if ($('#bigpic').attr('src') != newSrc)
+		var new_src = domAAroundImgThumb.prop('href').replace('thickbox', 'large');
+		var new_title = domAAroundImgThumb.prop('title');
+		var new_href = domAAroundImgThumb.prop('href');
+		if ($('#bigpic').prop('src') != new_src)
 		{
-			$('#bigpic').attr('src', newSrc).load(function() {
+			$('#bigpic').prop({
+				'src' : new_src, 
+				'alt' : new_title, 
+				'title' : new_title
+			}).load(function(){
 				if (typeof(jqZoomEnabled) != 'undefined' && jqZoomEnabled)
-					$(this).attr('rel', domAAroundImgThumb.attr('href'));
+					$(this).prop('rel', new_href);
 			}); 
 		}
 		$('#views_block li a').removeClass('shown');
diff --git a/themes/default/js/stores.js b/themes/default/js/stores.js
index 38065181e..ffd8e64ba 100644
--- a/themes/default/js/stores.js
+++ b/themes/default/js/stores.js
@@ -113,7 +113,7 @@ function searchLocationsNear(center)
 			createMarker(latlng, name, address, other, id_store, has_store_picture);
 			bounds.extend(latlng);
 
-			$('#stores-table tr:last').after('<tr class="node"><td class="num">'+parseInt(i + 1)+'</td><td><b>'+name+'</b>'+(has_store_picture === 1 ? '<br /><img src="'+img_store_dir+parseInt(id_store)+'-medium.jpg" alt="" />' : '')+'</td><td>'+address+(phone !== '' ? '<br /><br />'+translation_4+' '+phone : '')+'</td><td class="distance">'+distance+' '+distance_unit+'</td></tr>');
+			$('#stores-table tr:last').after('<tr class="node"><td class="num">'+parseInt(i + 1)+'</td><td><b>'+name+'</b>'+(has_store_picture === 1 ? '<br /><img src="'+img_store_dir+parseInt(id_store)+'-medium.jpg" alt="" />' : '')+'</td><td>'+address+'</td><td class="distance">'+distance+' '+distance_unit+'</td></tr>');
 			$('#stores-table').show();
 		}
 
diff --git a/themes/default/js/tools.js b/themes/default/js/tools.js
index 4215f7a88..7b670168c 100644
--- a/themes/default/js/tools.js
+++ b/themes/default/js/tools.js
@@ -95,7 +95,7 @@ function formatCurrency(price, currencyFormat, currencySign, currencyBlank)
 	if (currencyFormat == 4)
 		return (formatNumber(price, priceDisplayPrecision, ',', '.') + blank + currencySign);
 	if (currencyFormat == 5)
-		return (formatNumber(price, priceDisplayPrecision, ' ', '.') + blank + currencySign);
+		return (currencySign + blank + formatNumber(price, priceDisplayPrecision, '\'', '.'));
 	return price;
 }
 
diff --git a/themes/default/manufacturer.tpl b/themes/default/manufacturer.tpl
index e4ae56cc1..bd1e0e3e1 100644
--- a/themes/default/manufacturer.tpl
+++ b/themes/default/manufacturer.tpl
@@ -33,7 +33,7 @@
 		<div class="description_box">
 			{if !empty($manufacturer->short_description)}
 				<p>{$manufacturer->short_description}</p>
-				<p class="hide_desc">{$manufacturer->description}</p>
+				<div class="hide_desc">{$manufacturer->description}</div>
 				<a href="#" class="lnk_more" onclick="$(this).prev().slideDown('slow'); $(this).hide(); return false;">{l s='More'}</a>
 			{else}
 				<p>{$manufacturer->description}</p>
diff --git a/themes/default/mobile/contact-form.tpl b/themes/default/mobile/contact-form.tpl
index 6c435356a..01e82c761 100644
--- a/themes/default/mobile/contact-form.tpl
+++ b/themes/default/mobile/contact-form.tpl
@@ -39,7 +39,7 @@
 				{/foreach}
 			{else}
 				<select id="id_contact" name="id_contact" onchange="showElemFromSelect('id_contact', 'desc_contact')">
-					<option value="0">-- {l s='Subject Heading'} --</option>
+					<option value="0">- {l s='Subject Heading'} -</option>
 				{foreach from=$contacts item=contact}
 					<option value="{$contact.id_contact|intval}" {if isset($smarty.post.id_contact) && $smarty.post.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'htmlall':'UTF-8'}</option>
 				{/foreach}
@@ -65,7 +65,7 @@
 				{if (!isset($customerThread.id_order) || $customerThread.id_order > 0)}
 				<fieldset>
 					{if !isset($customerThread.id_order) && isset($isLogged) && $isLogged == 1}
-						<select name="id_order" ><option value="0">-- {l s='Order ID'} --</option>
+						<select name="id_order" ><option value="0">- {l s='Order ID'} -</option>
 						{foreach from=$orderList item=order}
 							<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
 						{/foreach}
@@ -82,7 +82,7 @@
 
 					{if !isset($customerThread.id_product)}
 						{foreach from=$orderedProductList key=id_order item=products name=products}
-							<select name="id_product"><option value="0">-- {l s='Product'} --</option>
+							<select name="id_product"><option value="0">- {l s='Product'} -</option>
 								{foreach from=$products item=product}
 									<option value="{$product.value|intval}">{$product.label|escape:'htmlall':'UTF-8'}</option>
 								{/foreach}
diff --git a/themes/default/mobile/order-detail.tpl b/themes/default/mobile/order-detail.tpl
index feaf3fee9..5bb34f101 100644
--- a/themes/default/mobile/order-detail.tpl
+++ b/themes/default/mobile/order-detail.tpl
@@ -51,7 +51,7 @@
 	{if $invoice AND $invoiceAllowed}
 	<li>
 		<img src="{$img_dir}icon/pdf.gif" alt="" class="icon" />
-		<a href="{$link->getPageLink('pdf-invoice', true)}?id_order={$order->id|intval}{if $is_guest}&secure_key={$order->secure_key}{/if}" data-ajax="false">{l s='Download your invoice as a PDF file.'}</li>
+		<a href="{$link->getPageLink('pdf-invoice', true)}?id_order={$order->id|intval}{if $is_guest}&secure_key={$order->secure_key}{/if}" data-ajax="false">{l s='Download your invoice as a PDF file.'}
 	</li>
 	{/if}
 	{if $order->recyclable}
@@ -278,7 +278,7 @@
 		<p>{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
 		<fieldset>
 			<label for="id_product">{l s='Product'}</label>
-			<select name="id_product" style="width:300px;">
+			<select name="id_product">
 				<option value="0">{l s='-- Choose --'}</option>
 				{foreach from=$products item=product name=products}
 					<option value="{$product.product_id}">{$product.product_name}</option>
diff --git a/themes/default/modules/blocksearch/blocksearch.tpl b/themes/default/modules/blocksearch/blocksearch.tpl
index 591644331..92d286177 100644
--- a/themes/default/modules/blocksearch/blocksearch.tpl
+++ b/themes/default/modules/blocksearch/blocksearch.tpl
@@ -32,7 +32,7 @@
 			<input type="hidden" name="orderby" value="position" />
 			<input type="hidden" name="controller" value="search" />
 			<input type="hidden" name="orderway" value="desc" />
-			<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
+			<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{Tools::htmlentitiesUTF8($smarty.get.search_query)|stripslashes}{/if}" />
 			<input type="submit" id="search_button" class="button_mini" value="{l s='go' mod='blocksearch'}" />
 		</p>
 	</form>
diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index aac6efad1..9a8f40adc 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -171,10 +171,13 @@
 								<td>
 								<div class="delivery_option_price">
 									{if $option.total_price_with_tax && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))}
+
 										{if $use_taxes == 1}
-											{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
-										{else}
-											{convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'}
+											{if $priceDisplay == 1}
+												{convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'}
+											{else}
+												{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
+											{/if}
 										{/if}
 									{else}
 										{l s='Free'}
diff --git a/themes/default/order-detail.tpl b/themes/default/order-detail.tpl
index d7fb91517..bfc8d7a9f 100644
--- a/themes/default/order-detail.tpl
+++ b/themes/default/order-detail.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
 *}
-
+{if isset($order)}
 <form action="{if isset($opc) && $opc}{$link->getPageLink('order-opc', true)}{else}{$link->getPageLink('order', true)}{/if}" method="post" class="submit">
 	<div>
 		<input type="hidden" value="{$order->id}" name="id_order"/>
@@ -424,3 +424,4 @@
 {else}
 <p><img src="{$img_dir}icon/infos.gif" alt="" class="icon" />&nbsp;{l s='You cannot return merchandise with a guest account'}</p>
 {/if}
+{/if}
\ No newline at end of file
diff --git a/themes/default/order-follow.tpl b/themes/default/order-follow.tpl
index 41abbb6f2..d28466617 100644
--- a/themes/default/order-follow.tpl
+++ b/themes/default/order-follow.tpl
@@ -70,7 +70,7 @@
 		{foreach from=$ordersReturn item=return name=myLoop}
 			<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
 				<td class="bold"><a class="color-myaccount" href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">{l s='#'}{$return.id_order_return|string_format:"%06d"}</a></td>
-				<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{l s='#'}{$return.id_order|string_format:"%06d"}</a></td>
+				<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{$return.reference}</a></td>
 				<td class="history_method"><span class="bold">{$return.state_name|escape:'htmlall':'UTF-8'}</span></td>
 				<td class="bold">{dateFormat date=$return.date_add full=0}</td>
 				<td class="history_invoice">
diff --git a/themes/default/order-opc-new-account.tpl b/themes/default/order-opc-new-account.tpl
index 676ee7b11..4e31a068c 100644
--- a/themes/default/order-opc-new-account.tpl
+++ b/themes/default/order-opc-new-account.tpl
@@ -74,19 +74,18 @@
 				{literal}
 				function vat_number()
 				{
-					if ($('#company').val() != '')
+					if (($('#company').length) && ($('#company').val() != ''))
 						$('#vat_number_block').show();
 					else
 						$('#vat_number_block').hide();
 				}
 				function vat_number_invoice()
 				{
-					if ($('#company_invoice').val() != '')
+					if (($('#company_invoice').length) && ($('#company_invoice').val() != ''))
 						$('#vat_number_block_invoice').show();
 					else
 						$('#vat_number_block_invoice').hide();
 				}
-				
 				$(document).ready(function() {
 					$('#company').on('input',function(){
 						vat_number();
@@ -96,6 +95,10 @@
 					});
 					vat_number();
 					vat_number_invoice();
+					{/literal}
+					$('.id_state option[value={if isset($guestInformations.id_state)}{$guestInformations.id_state|intval}{/if}]').prop('selected', true);
+					$('.id_state_invoice option[value={if isset($guestInformations.id_state_invoice)}{$guestInformations.id_state_invoice|intval}{/if}]').prop('selected', true);
+					{literal}
 				});
 				{/literal}
 				</script>
@@ -203,7 +206,7 @@
 				{elseif $field_name eq "address2"}
 				<p class="text is_customer_param">
 					<label for="address2">{l s='Address (Line 2)'}</label>
-					<input type="text" class="text" name="address2" id="address2" value="" />
+					<input type="text" class="text" name="address2" id="address2" value="{if isset($guestInformations) && $guestInformations.address2}{$guestInformations.address2}{/if}" />
 				</p>
 				{elseif $field_name eq "postcode"}
 				{$postCodeExist = true}
@@ -279,7 +282,7 @@
 				<input type="hidden" name="alias" id="alias" value="{l s='My address'}"/>
 
 				<p class="checkbox">
-					<input type="checkbox" name="invoice_address" id="invoice_address" autocomplete="off"/>
+					<input type="checkbox" name="invoice_address" id="invoice_address"{if (isset($smarty.post.invoice_address) && $smarty.post.invoice_address) || (isset($guestInformations) && $guestInformations.invoice_address)} checked="checked"{/if} autocomplete="off"/>
 					<label for="invoice_address"><b>{l s='Please use another address for invoice'}</b></label>
 				</p>
 
@@ -289,7 +292,7 @@
 					<h3>{l s='Invoice address'}</h3>
 					{foreach from=$inv_all_fields item=field_name}
 					{if $field_name eq "company" &&  $b2b_enable}
-					<p class="text is_customer_param">
+					<p class="text">
 						<label for="company_invoice">{l s='Company'}</label>
 						<input type="text" class="text" id="company_invoice" name="company_invoice" value="" />
 					</p>
@@ -329,7 +332,7 @@
 					{$postCodeExist = true}
 					<p class="required postcode_invoice text">
 						<label for="postcode_invoice">{l s='Zip / Postal Code'} <sup>*</sup></label>
-						<input type="text" class="text" name="postcode_invoice" id="postcode_invoice" value="{if isset($guestInformations) && $guestInformations.postcode_invoice}{$guestInformations.postcode_invoice}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
+						<input type="text" class="text" name="postcode_invoice" id="postcode_invoice" value="{if isset($guestInformations) && $guestInformations.postcode_invoice}{$guestInformations.postcode_invoice}{/if}" onkeyup="$('#postcode_invoice').val($('#postcode_invoice').val().toUpperCase());" />
 					</p>
 					{elseif $field_name eq "city"}
 					<p class="required text">
@@ -375,13 +378,13 @@
 						<textarea name="other_invoice" id="other_invoice" cols="26" rows="3"></textarea>
 					</p>
 					{if isset($one_phone_at_least) && $one_phone_at_least}
-						<p class="inline-infos required">{l s='You must register at least one phone number.'}</p>
+						<p class="inline-infos required is_customer_param">{l s='You must register at least one phone number.'}</p>
 					{/if}					
-					<p class="text">
+					<p class="text is_customer_param">
 						<label for="phone_invoice">{l s='Home phone'}</label>
 						<input type="text" class="text" name="phone_invoice" id="phone_invoice" value="{if isset($guestInformations) && $guestInformations.phone_invoice}{$guestInformations.phone_invoice}{/if}" />
 					</p>
-					<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text is_customer_param">
+					<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
 						<label for="phone_mobile_invoice">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
 						<input type="text" class="text" name="phone_mobile_invoice" id="phone_mobile_invoice" value="{if isset($guestInformations) && $guestInformations.phone_mobile_invoice}{$guestInformations.phone_mobile_invoice}{/if}" />
 					</p>
@@ -402,4 +405,4 @@
 		</fieldset>
 	</form>
 	<div class="clear"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/themes/default/product-list.tpl b/themes/default/product-list.tpl
index 0db3e34b8..a59e18b9f 100644
--- a/themes/default/product-list.tpl
+++ b/themes/default/product-list.tpl
@@ -51,7 +51,7 @@
 				{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
 				<div class="content_price">
 					{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}<span class="price" style="display: inline;">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span><br />{/if}
-					{if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}</span>{/if}
+					{if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}<span class="warning_inline">{l s='Out of stock'}</span>{/if}</span>{/if}
 				</div>
 				{if isset($product.online_only) && $product.online_only}<span class="online_only">{l s='Online only'}</span>{/if}
 				{/if}
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index b208166d0..25df35377 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -184,7 +184,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 		<div id="image-block">
 		{if $have_image}
 			<span id="view_full_size">
-				<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
+				<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{if !empty($cover.legend)}{$cover.legend|escape:'htmlall':'UTF-8'}{else}{$product->name|escape:'htmlall':'UTF-8'}{/if}" alt="{if !empty($cover.legend)}{$cover.legend|escape:'htmlall':'UTF-8'}{else}{$product->name|escape:'htmlall':'UTF-8'}{/if}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
 				<span class="span_link">{l s='Maximize'}</span>
 			</span>
 		{else}
@@ -200,16 +200,21 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 		{if isset($images) && count($images) > 3}<span class="view_scroll_spacer"><a id="view_scroll_left" class="hidden" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Previous'}</a></span>{/if}
 		<div id="thumbs_list">
 			<ul id="thumbs_list_frame">
-				{if isset($images)}
-					{foreach from=$images item=image name=thumbnails}
+			{if isset($images)}
+				{foreach from=$images item=image name=thumbnails}
 					{assign var=imageIds value="`$product->id`-`$image.id_image`"}
+					{if !empty($image.legend)}
+						{assign var=imageTitlte value=$image.legend|escape:'htmlall':'UTF-8'}
+					{else}
+						{assign var=imageTitlte value=$product->name|escape:'htmlall':'UTF-8'}
+					{/if}
 					<li id="thumbnail_{$image.id_image}">
-						<a href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html'}" rel="other-views" class="thickbox{if $smarty.foreach.thumbnails.first} shown{/if}" title="{$image.legend|htmlspecialchars}">
-							<img id="thumb_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'medium_default')|escape:'html'}" alt="{$image.legend|htmlspecialchars}" height="{$mediumSize.height}" width="{$mediumSize.width}" />
+						<a href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html'}" rel="other-views" class="thickbox{if $smarty.foreach.thumbnails.first} shown{/if}" title="{$imageTitlte}">
+							<img id="thumb_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'medium_default')|escape:'html'}" alt="{$imageTitlte}" title="{$imageTitlte}" height="{$mediumSize.height}" width="{$mediumSize.width}" />
 						</a>
 					</li>
-					{/foreach}
-				{/if}
+				{/foreach}
+			{/if}
 			</ul>
 		</div>
 		{if isset($images) && count($images) > 3}<a id="view_scroll_right" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Next'}</a>{/if}