diff --git a/admin-dev/tabs/AdminFeatures.php b/admin-dev/tabs/AdminFeatures.php
index 9e4852df8..cfda801a5 100644
--- a/admin-dev/tabs/AdminFeatures.php
+++ b/admin-dev/tabs/AdminFeatures.php
@@ -170,7 +170,7 @@ class AdminFeatures extends AdminTab
 					echo '</div>';
 				}
 				echo '
-				'.Module::hookExec('featureForm', array('id_attribute_group' => $obj->id)).'
+				'.Module::hookExec('featureForm', array('id_feature' => $obj->id)).'
 				<div class="margin-form">
 					<input type="submit" value="'.$this->l('   Save   ').'" name="submitAdd'.$this->table.'" class="button" />
 				</div>
diff --git a/admin-dev/tabs/AdminGenerator.php b/admin-dev/tabs/AdminGenerator.php
index e018e2c1b..12d8d083e 100644
--- a/admin-dev/tabs/AdminGenerator.php
+++ b/admin-dev/tabs/AdminGenerator.php
@@ -131,13 +131,13 @@ class AdminGenerator extends AdminTab
 				{
 					// PS Comments
 					fwrite($writeFd, "# robots.txt automaticaly generated by PrestaShop e-commerce open-source solution\n");
-					fwrite($writeFd, "# http://www.prestashop.com - http://www.prestashop.com/forums\n\n");
+					fwrite($writeFd, "# http://www.prestashop.com - http://www.prestashop.com/forums\n");
 					fwrite($writeFd, "# This file is to prevent the crawling and indexing of certain parts\n");
 					fwrite($writeFd, "# of your site by web crawlers and spiders run by sites like Yahoo!\n");
 					fwrite($writeFd, "# and Google. By telling these \"robots\" where not to go on your site,\n");
-					fwrite($writeFd, "# you save bandwidth and server resources.\n\n");
+					fwrite($writeFd, "# you save bandwidth and server resources.\n");
 					fwrite($writeFd, "# For more information about the robots.txt standard, see:\n");
-					fwrite($writeFd, "# http://www.robotstxt.org/wc/robots.html\n\n");
+					fwrite($writeFd, "# http://www.robotstxt.org/wc/robots.html\n");
 
 					//GoogleBot specific
 					fwrite($writeFd, "# GoogleBot specific\n");
@@ -146,7 +146,7 @@ class AdminGenerator extends AdminTab
 						fwrite($writeFd, 'Disallow: '.__PS_BASE_URI__.$GB."\n");
 					
 					// User-Agent
-					fwrite($writeFd, "# All bots\n\n");
+					fwrite($writeFd, "# All bots\n");
 					fwrite($writeFd, "User-agent: *\n");
 
 					// Directories
@@ -193,4 +193,4 @@ class AdminGenerator extends AdminTab
 
 		return $tab;
 	}
-}
\ No newline at end of file
+}
diff --git a/admin-dev/tabs/AdminImages.php b/admin-dev/tabs/AdminImages.php
index 1ba072551..8fce7381e 100644
--- a/admin-dev/tabs/AdminImages.php
+++ b/admin-dev/tabs/AdminImages.php
@@ -443,8 +443,16 @@ class AdminImages extends AdminTab
 		<br /><h2 class="space">'.$this->l('Move images').'</h2>'.
 		$this->l('A new storage system for product images is now used by PrestaShop. It offers better performance if your shop has a very large number of products.').'<br />'.
 		'<br />';
+		if (file_exists(_PS_PROD_IMG_DIR_.'duplicates/'))
+		{
+			echo '<div class="width4">';
+			$this->displayWarning($this->l('Duplicate images were found when moving the product images. It is probably caused by unused demonstration images. Please make sure that the folder ').
+				_PS_PROD_IMG_DIR_.'duplicates/'.
+				$this->l(' only contains demonstration images then delete this folder.'));
+			echo '</div>';
+		}
 		if($safe_mode)
-			echo $this->displayWarning('PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should continue to use the actual system.');
+			$this->displayWarning($this->l('PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should continue to use the actual system.'));
 		else
 			echo '
 		<form action="'.self::$currentIndex.'&token='.$this->token.'" method="post">
diff --git a/admin-dev/tabs/AdminPPreferences.php b/admin-dev/tabs/AdminPPreferences.php
index d21ec1f88..18598ff96 100644
--- a/admin-dev/tabs/AdminPPreferences.php
+++ b/admin-dev/tabs/AdminPPreferences.php
@@ -71,7 +71,7 @@ class AdminPPreferences extends AdminPreferences
 					'PS_PRODUCT_PICTURE_WIDTH' => array('title' => $this->l('Product pictures width:'), 'desc' => $this->l('The maximum width of pictures uploadable by customers'), 'validation' => 'isUnsignedId', 'required' => true, 'cast' => 'intval', 'type' => 'text', 'visibility' => Shop::CONTEXT_ALL),
 					'PS_PRODUCT_PICTURE_HEIGHT' => array('title' => $this->l('Product pictures height:'), 'desc' => $this->l('The maximum height of pictures uploadable by customers'), 'validation' => 'isUnsignedId', 'required' => true, 'cast' => 'intval', 'type' => 'text', 'visibility' => Shop::CONTEXT_ALL),
 					'PS_LEGACY_IMAGES' => array('title' => $this->l('Use the legacy image filesystem:'), 'desc' => $this->l('This should be set to yes unless you successfully moved images in Preferences > Images tab'), 'validation' => 'isBool', 'cast' => 'intval', 'required' => true, 'type' => 'bool', 'visibility' => Shop::CONTEXT_ALL),
-					'PS_QTY_DISCOUNT_ON_COMBINATION' => array('title' => $this->l('Quantity discounts based on:'), 'desc' => $this->l('The way of calculate quantity discounts'), 'cast' => 'intval', 'show' => true, 'required' => true, 'type' => 'radio', 'validation' => 'isBool', 'choices' => array(0 => $this->l('Products'), 1 => $this->l('Combinations')))
+			'PS_QTY_DISCOUNT_ON_COMBINATION' => array('title' => $this->l('Quantity discounts based on:'), 'desc' => $this->l('How to calculate quantity discounts'), 'cast' => 'intval', 'show' => true, 'required' => true, 'type' => 'radio', 'validation' => 'isBool', 'choices' => array(0 => $this->l('Products'), 1 => $this->l('Combinations')))
 				),
 			),
 		);
diff --git a/admin-dev/tabs/AdminUpgrade.php b/admin-dev/tabs/AdminUpgrade.php
index 77ed6fc3b..7116eaabd 100755
--- a/admin-dev/tabs/AdminUpgrade.php
+++ b/admin-dev/tabs/AdminUpgrade.php
@@ -1573,9 +1573,17 @@ echo '</script>';
 		$tokenModule = Tools::getAdminToken('AdminModules'.(int)(Tab::getIdFromClassName('AdminModules')).(int)$cookie->id_employee);
 		$tokenAdminTabs =  Tools::getAdminToken('AdminTabs'.(int)(Tab::getIdFromClassName('AdminTabs')).(int)$cookie->id_employee);
 		$tokenAdminTools =  Tools::getAdminToken('AdminTools'.(int)(Tab::getIdFromClassName('AdminTools')).(int)$cookie->id_employee);
+		if (!$idTab = Tab::getIdFromClassName('AdminSelfUpgrade'))
+		{
 		echo '<br/><p id="ContainerActivateButton">
 			<a class="button" id="activateAutoupgradeModule" href="index.php?tab=AdminModules&token='.$tokenModule.'&amp;install=autoupgrade&amp;module_name=autoupgrade">'
 			.$this->l('Activate the module').'</a></p>';
+		}
+		else{
+			$tokenSelfUpgrade =  Tools::getAdminToken('AdminSelfUpgrade'.(int)(Tab::getIdFromClassName('AdminSelfUpgrade')).(int)$cookie->id_employee);
+			echo '	<a class="button" href="index.php?tab=AdminSelfUpgrade&token='.$tokenSelfUpgrade.'">'
+				.$this->l('Use the autoupgrade module').'</a></p>';
+		}
 		echo '<script type="text/javascript">
 			$("#activateAutoupgradeModule").click(function(e){
 				e.preventDefault();
diff --git a/classes/Image.php b/classes/Image.php
index 69efea08c..853e4b4f1 100644
--- a/classes/Image.php
+++ b/classes/Image.php
@@ -523,12 +523,14 @@ class ImageCore extends ObjectModel
 	 * If max_execution_time is provided, stops before timeout and returns string "timeout".
 	 * If any image cannot be moved, stops and returns "false"
 	 *
+	 * @param int max_execution_time
 	 * @return mixed success or timeout
 	 */
 	public static function moveToNewFileSystem($max_execution_time = 0)
 	{
 		$start_time = time();
 		$image = null;
+		$tmp_folder = 'duplicates/';
 		foreach (scandir(_PS_PROD_IMG_DIR_) as $file)
 		{
 			// matches the base product image or the thumbnails
@@ -537,17 +539,28 @@ class ImageCore extends ObjectModel
 				// don't recreate an image object for each image type
 				if (!$image || $image->id !== (int)$matches[2])
 					$image = new Image((int)$matches[2]);
-
-				if (Validate::isLoadedObject($image))
+				// image exists in DB and with the correct product?
+				if (Validate::isLoadedObject($image) && $image->id_product == (int)rtrim($matches[1], "-"))
 				{
 				// create the new folder if it does not exist
 				if (!$image->createImgFolder())
 					return false;
 				
-				// move the image
+					// if there's already a file at the new image path, move it to a dump folder
+					// most likely the preexisting image is a demo image not linked to a product and it's ok to replace it
 					$new_path = _PS_PROD_IMG_DIR_.$image->getImgPath().(isset($matches[3]) ? $matches[3] : '').'.jpg';
 				if (file_exists($new_path))
+					{
+						if(!file_exists(_PS_PROD_IMG_DIR_.$tmp_folder))
+						{
+							@mkdir(_PS_PROD_IMG_DIR_.$tmp_folder, 0755);
+							@chmod(_PS_PROD_IMG_DIR_.$tmp_folder, 0755);	
+						}
+						$tmp_path = _PS_PROD_IMG_DIR_.$tmp_folder.basename($file);
+						if (!@rename($new_path, $tmp_path) || !file_exists($tmp_path))
 						return false;
+					}
+					// move the image
 				if (!@rename(_PS_PROD_IMG_DIR_.$file, $new_path) || !file_exists($new_path))
 					return false;
 				}
diff --git a/classes/Product.php b/classes/Product.php
index 2d13c3474..8e915fb6e 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -393,9 +393,17 @@ class ProductCore extends ObjectModel
 		if (!parent::add($autodate, $nullValues))
 			return false;
 		$this->setStock($this->quantity);
+		Module::hookExec('afterSaveProduct', array('id_product' => $this->id));
 		return true;
 	}
 
+	public function update($nullValues = false)
+	{
+		$return = parent::update($nullValues);
+		Module::hookExec('afterSaveProduct', array('id_product' => $this->id));
+		return $return;
+	}
+
 	/**
 	* Check then return multilingual fields for database interaction
 	*
@@ -3567,4 +3575,4 @@ class ProductCore extends ObjectModel
 	                
 		return isset($row['reference']);
 	}
-}
\ No newline at end of file
+}
diff --git a/classes/Tools.php b/classes/Tools.php
index 0ca7f0e0a..df90b4798 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1941,15 +1941,13 @@ FileETag INode MTime Size
 			case 'by' :
 				$orderByPrefix = '';
 				if($prefix) {
-					if ($value == 'id_product' OR	$value == 'date_add')
+					if ($value == 'id_product' || $value == 'date_add' || $value == 'price')
 						$orderByPrefix = 'p.';
 					elseif ($value == 'name')
 						$orderByPrefix = 'pl.';
 					elseif ($value == 'manufacturer')
-					{
 						$orderByPrefix = 'm.';
-					}
-					elseif ($value == 'position')
+					elseif ($value == 'position' || empty($value))
 						$orderByPrefix = 'cp.';
 				}
 				
diff --git a/classes/Upgrader.php b/classes/Upgrader.php
index b56637d1e..af25ba5ca 100644
--- a/classes/Upgrader.php
+++ b/classes/Upgrader.php
@@ -40,6 +40,7 @@ class UpgraderCore{
 	public $version_num;
 	public $link;
 	public $autoupgrade;
+	public $autoupgrade_module;
 	public $changelog;
 	public $md5;
 
@@ -95,6 +96,7 @@ class UpgraderCore{
 	{
 		if (empty($this->link))
 		{
+
 			$lastCheck = Configuration::get('PS_LAST_VERSION_CHECK');
 			// if we use the autoupgrade process, we will never refresh it
 			// except if no check has been done before
@@ -103,12 +105,14 @@ class UpgraderCore{
 			libxml_set_streams_context(stream_context_create(array('http' => array('timeout' => 3))));
 				if ($feed = @simplexml_load_file($this->rss_version_link))
 			{
+
 					$this->version_name = (string)$feed->version->name;
 					$this->version_num = (string)$feed->version->num;
 					$this->link = (string)$feed->download->link;
 					$this->md5 = (string)$feed->download->md5;
 					$this->changelog = (string)$feed->download->changelog;
 					$this->autoupgrade = (int)$feed->autoupgrade;
+					$this->autoupgrade_module = (int)$feed->autoupgrade_module;
 					$this->desc = (string)$feed->desc ;
 					$configLastVersion = array(
 						'name' => $this->version_name,
@@ -116,9 +120,11 @@ class UpgraderCore{
 						'link' => $this->link,
 						'md5' => $this->md5,
 						'autoupgrade' => $this->autoupgrade,
+						'autoupgrade_module' => $this->autoupgrade_module,
 						'changelog' => $this->changelog,
 						'desc' => $this->desc
 					);
+
 					Configuration::updateValue('PS_LAST_VERSION',serialize($configLastVersion));
 					Configuration::updateValue('PS_LAST_VERSION_CHECK',time());
 			}
@@ -130,6 +136,7 @@ class UpgraderCore{
 				$this->version_num = $lastVersionCheck['num'];
 				$this->link = $lastVersionCheck['link'];
 				$this->autoupgrade = $lastVersionCheck['autoupgrade'];
+				$this->autoupgrade_module = $lastVersionCheck['autoupgrade_module'];
 				$this->md5 = $lastVersionCheck['md5'];
 				$this->desc = $lastVersionCheck['desc'];
 				$this->changelog = $lastVersionCheck['changelog'];
diff --git a/config/modules_list.xml b/config/modules_list.xml
index b959d5cb6..2e44c44e4 100755
--- a/config/modules_list.xml
+++ b/config/modules_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <modules_list>
 	<modules type="native">
+		<module name="autoupgrade"/>
 		<module name="bankwire"/>
 		<module name="birthdaypresent"/>
 		<module name="blockadvertising"/>
@@ -95,6 +96,7 @@
 		<module name="criteo"/>
 		<module name="dejala"/>
 		<module name="dibs"/>
+	  <module name="ebay"/> 
 		<module name="envoimoinscher"/>
 		<module name="ekomi"/>
 		<module name="fedexcarrier"/>
diff --git a/controllers/CategoryController.php b/controllers/CategoryController.php
index 4a50c2571..978e466e6 100644
--- a/controllers/CategoryController.php
+++ b/controllers/CategoryController.php
@@ -134,15 +134,12 @@ class CategoryControllerCore extends FrontController
 						'subcategories_nb_total' => sizeof($subCategories),
 						'subcategories_nb_half' => ceil(sizeof($subCategories) / 2)));
 				}
+
 				if ($this->category->id != 1)
-				{
-					$nbProducts = $this->category->getProducts(NULL, NULL, NULL, $this->orderBy, $this->orderWay, true);
-					$this->pagination((int)$nbProducts);
-					$this->context->smarty->assign('nb_products', (int)$nbProducts);
-					$cat_products = $this->category->getProducts($this->context->language->id, (int)($this->p), (int)($this->n), $this->orderBy, $this->orderWay);
-				}
+					$this->productListAssign();
+
 				$this->context->smarty->assign(array(
-					'products' => (isset($cat_products) AND $cat_products) ? $cat_products : NULL,
+					'products' => (isset($this->cat_products) AND $this->cat_products) ? $this->cat_products : NULL,
 					'id_category' => (int)($this->category->id),
 					'id_category_parent' => (int)($this->category->id_parent),
 					'return_category_name' => Tools::safeOutput($this->category->name),
@@ -168,6 +165,21 @@ class CategoryControllerCore extends FrontController
 		));
 	}
 
+	public function productListAssign()
+	{
+		$hookExecuted = false;
+		Module::hookExec('productListAssign', array('nbProducts' => &$this->nbProducts, 'catProducts' => &$this->cat_products, 'hookExecuted' => &$hookExecuted));
+		if (!$hookExecuted)
+		{
+			$this->nbProducts = $this->category->getProducts(NULL, NULL, NULL, $this->orderBy, $this->orderWay, true);
+			$this->pagination((int)$this->nbProducts);
+			$this->cat_products = $this->category->getProducts($this->context->language->id, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay);
+		}
+		else
+			$this->pagination((int)$this->nbProducts);
+		self::$smarty->assign('nb_products', (int)$this->nbProducts);
+	}
+
 	public function displayContent()
 	{
 		parent::displayContent();
diff --git a/controllers/OrderConfirmationController.php b/controllers/OrderConfirmationController.php
index ad791c03b..8d2c20b67 100644
--- a/controllers/OrderConfirmationController.php
+++ b/controllers/OrderConfirmationController.php
@@ -76,7 +76,7 @@ class OrderConfirmationControllerCore extends FrontController
 				'id_order_formatted' => sprintf('#%06d', $this->id_order)
 			));
 			/* If guest we clear the cookie for security reason */
-			$this->context->customer->logout();
+			$this->context->customer->mylogout();
 		}
 	}
 	
diff --git a/controllers/OrderController.php b/controllers/OrderController.php
index 297846c5a..f14002d2c 100644
--- a/controllers/OrderController.php
+++ b/controllers/OrderController.php
@@ -112,7 +112,7 @@ class OrderControllerCore extends ParentOrderController
 					if ($this->context->customer->is_guest)
 					{
 						$email = $this->context->customer->email;
-						$this->context->customer->logout(); // If guest we clear the cookie for security reason
+						$this->context->customer->mylogout(); // If guest we clear the cookie for security reason
 						Tools::redirect('index.php?controller=guest-tracking&id_order='.(int)$id_order.'&email='.urlencode($email));
 					}
 					else
diff --git a/install-dev/classes/ToolsInstall.php b/install-dev/classes/ToolsInstall.php
index 8dcb38b79..d09db608d 100644
--- a/install-dev/classes/ToolsInstall.php
+++ b/install-dev/classes/ToolsInstall.php
@@ -40,13 +40,22 @@ class ToolsInstall
 	{
 		// Don't include theses files if classes are already defined
 		if (!class_exists('Validate', false))
-			require_once(INSTALL_PATH.'/../classes/Validate.php');
+		{
+			include_once(INSTALL_PATH.'/../classes/Validate.php');
+			eval('class Validate extends ValidateCore{}');
+		}
 
 		if (!class_exists('Db', false))
-			require_once(INSTALL_PATH.'/../classes/Db.php');
+		{
+			include_once(INSTALL_PATH.'/../classes/Db.php');
+			eval('abstract class Db extends DbCore{}');
+		}
 
 		if (!class_exists('MySQL', false))
-			require_once(INSTALL_PATH.'/../classes/MySQL.php');
+		{
+			include_once(INSTALL_PATH.'/../classes/MySQL.php');
+			eval('class MySQL extends MySQLCore{}');
+		}
 		
 		if($posted)
 		{
diff --git a/install-dev/index.php b/install-dev/index.php
index f2e855564..fee6b5f15 100644
--- a/install-dev/index.php
+++ b/install-dev/index.php
@@ -813,14 +813,20 @@ if ($lm->getIncludeTradFilename())
 										</tr>
 									</table>';
 
+									$country_iso_code_default = '';
+									if ($_GET['language'] == 1) $country_iso_code_default = 'FR';
+									else if ($_GET['language'] == 2) $country_iso_code_default = 'ES';
+									else if ($_GET['language'] == 3) $country_iso_code_default = 'DE';
+									else if ($_GET['language'] == 4) $country_iso_code_default = 'IT';
+
 									foreach ($modulesHelpInstall AS $country_iso_code => $modulesList)
 							{
-								echo '<div class="installModuleList'.($country_iso_code == 'FR' ? ' selected' : '').'" id="modulesList'.$country_iso_code.'">';
+										echo '<div class="installModuleList'.($country_iso_code == $country_iso_code_default ? ' selected' : '').'" id="modulesList'.$country_iso_code.'">';
 										foreach ($modulesList AS $module)
 								{
 									echo '
 										<table cellpadding="0" callspacing="0" border="0" class="moduleTable">
-									<tr>
+											<tr style="border-bottom:0px">
 										<td valign="top" style="text-align: center; padding-top:10px; width: 30px;">
 										<span style="padding: 12px 4px 6px 2px;">
 									<input type="checkbox" id="preInstallModules_'.$country_iso_code.'_'.$module.'" value="'.$module.'" class="'.$module.' preInstallModules_'.$country_iso_code.'" style="vertical-align: middle;" />
@@ -989,7 +995,7 @@ if ($lm->getIncludeTradFilename())
 					</tr>
 				</table>
 
-				<h3 class="infosBlock"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder.'); ?></h3>
+				<h3 class="infosBlock"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?></h3>
 				
 				<div id="boBlock" class="blockInfoEnd clearfix">
 						<img src="img/visu_boBlock.png" />
@@ -1357,7 +1363,7 @@ if ($lm->getIncludeTradFilename())
 <ul id="footer">
 	<li><a href="http://www.prestashop.com/forum/" title="<?php echo lang('Official forum'); ?>"><?php echo lang('Official forum'); ?></a> | </li>
 	<li><a href="http://www.prestashop.com" title="PrestaShop.com">PrestaShop.com</a> | </li>
-	<li><a href="http://www.prestashop.com/contact.php" title="<?php echo lang('Contact us'); ?>"><?php echo lang('Contact us'); ?></a> | </li>
+	<li><a href="http://www.prestashop.com/contact.php" title="<?php echo lang('Contact us!'); ?>"><?php echo lang('Contact us!'); ?></a> | </li>
 	<li>&copy; 2005-<?php echo date('Y'); ?></li>
 </ul>
 </body>
diff --git a/install-dev/langs/de.php b/install-dev/langs/de.php
index eb26d3de8..59d60a79a 100644
--- a/install-dev/langs/de.php
+++ b/install-dev/langs/de.php
@@ -20,7 +20,7 @@ $_LANG['Community Forum'] = 'unser Community-Forum';
 $_LANG['Configure SMTP manually (advanced users only)'] = 'Konfigurieren des SMTP-Sendens (nur für Experten)';
 $_LANG['Configure your database by filling out the following fields:'] = 'Konfigurieren Sie Ihre Datenbank, indem Sie  folgende Felder ausfüllen:';
 $_LANG['Congratulation, your online shop is now ready!'] = 'Herzlichen Glückwunsch, Ihr Shop installiert!';
-$_LANG['Contact us'] = 'Kontaktieren Sie uns!';
+$_LANG['Contact us!'] = 'Kontaktieren Sie uns!';
 $_LANG['Create new files and folders allowed'] = 'Erstellen neuer Ordner und Dateien zugelassen';
 $_LANG['Data integrity is not valided. Hack attempt?'] = 'Die Integrität der Daten ist nicht bestätigt.';
 $_LANG['Database Server is available but database is not found'] = 'Der Datenbank-Server steht zur Verfügung, aber die Datenbank wurde nicht gefunden';
@@ -63,7 +63,7 @@ $_LANG['Installation : complete install of the PrestaShop Solution'] = 'Komplett
 $_LANG['Installation is complete!'] = 'Installation abgeschlossen!';
 $_LANG['Installation method'] = 'Installationsmethode';
 $_LANG['Last name:'] = 'Name:';
-$_LANG['License Agreement'] = 'Lizenzvertrag';
+$_LANG['Licenses Agreement'] = 'Lizenzvertrag';
 $_LANG['Login:'] = 'Benutzername:';
 $_LANG['Merchant info'] = 'Informationen über den Verkäufer';
 $_LANG['Missing a temporary folder'] = 'Der temporäre Ordner Ihrer empfangenen Dateisendungen fehlt. Bitte wenden Sie sich an Ihren Systemadministrator.';
@@ -140,10 +140,10 @@ $_LANG['Update is complete!'] = 'Aktualisierung beendet!';
 $_LANG['Upgrade: get the latest stable version!'] = 'Aktualisierung: Installieren Sie die neueste Version von PrestaShop';
 $_LANG['Verify now!'] = 'Testen der SQL-Verbindung';
 $_LANG['Verify system compatibility'] = 'Systemkompatibilität';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\' und die readme-Dateien (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
+$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\' und die readme-Dateien (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Vorsicht: eine manuelle Sicherung ist UNERLÄSSLICH, bevor mit der Aktualisierung der PrestaShop-Anwendung begonnen wird, um jeglichen versehentlichen Datenverlust zu verhindern';
 $_LANG['Welcome'] = 'Willkommen';
-$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenue dans l\'installation de PrestaShop %s';
+$_LANG['Welcome to the PrestaShop %s Installer'] = 'Willkommen bei der Installation von PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Sobald die Anwendungsdateien und Ihre Datenbank gesichert sind, werden wir Sie um Bestätigung bitten. Damit übernehmen Sie die gesamte Haftung eines möglichen Datenverlusts durch die Aktualisierung der PrestaShop-Anwendung.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'Schreibberechtigung für die Ordner (und deren Unterordner):';
 $_LANG['Write permissions on files and folders:'] = 'Schreibberechtigung für die Dateien und Ordner:';
diff --git a/install-dev/langs/es.php b/install-dev/langs/es.php
index 397f0f57c..617a7cd8d 100644
--- a/install-dev/langs/es.php
+++ b/install-dev/langs/es.php
@@ -1,39 +1,39 @@
 <?php
 
-$_LANG['Installer'] = 'Instalación';
-$_LANG['Updater'] = 'Actualizatión';
+$_LANG['Installer'] = 'Instalación';
+$_LANG['Updater'] = 'Actualizatión';
 $_LANG['.'] = '.';
 $_LANG['A Prestashop database already exists, please drop it or change the prefix.'] = 'Ya existe una base de datos PrestaShop con este prefijo, debe eliminarla manualmente o cambiar el prefijo.';
-$_LANG['An email has been sent!'] = '¡Se ha enviado un correo electrónico!';
+$_LANG['An email has been sent!'] = '¬°Se ha enviado un correo electrónico!';
 $_LANG['Access and configure PHP 5.0+ on your hosting server'] = 'Comprobar que su alojamiento web propone PHP5 y/o activarlo';
 $_LANG['An error occurred while resizing the picture.'] = 'Se ha producido un error al cambiar el tamaño de la imagen.';
-$_LANG['An error occurred while sending email, please verify your parameters.'] = 'Se ha producido un error al enviar el correo electrónico, gracias por verificar la configuración.';
+$_LANG['An error occurred while sending email, please verify your parameters.'] = 'Se ha producido un error al enviar el correo electrónico, gracias por verificar la configuración.';
 $_LANG['Available shop languages'] = 'Elija idioma';
 $_LANG['Back'] = 'Anterior';
-$_LANG['Back up your database and all application files (update only)'] = 'Salvaguardar su base de datos y sus archivos (únicamente en caso de actualización de PrestaShop)';
+$_LANG['Back up your database and all application files (update only)'] = 'Salvaguardar su base de datos y sus archivos (únicamente en caso de actualización de PrestaShop)';
 $_LANG['Please backup the database and application files.'] = 'Antes de continuar, debe hacer una copia de sus datos. Por favor copie todos los archivos desde el sitio en una carpeta de copia de seguridad, y guarde su base de datos.';
-$_LANG['By default, the PHP \'mail()\' function is used'] = 'Por defecto, se utilizará la función PHP \'mail()\'';
-$_LANG['Can\'t create settings file, if /config/settings.inc.php exists, please give the public write permissions to this file, else please create a file named settings.inc.php in config directory.'] = 'Error en la creación del archivo de configuración, si el archivo /config/settings.inc.php existe, por favor dele derechos púplicos de\escritura; si no, cree un archivo settings.inc.php en el repertorio de configuración (/config/)';
-$_LANG['Can\'t find the sql upgrade files. Please verify that the /install/sql/upgrade folder is not empty)'] = 'Imposible encontrar uno de los archivos de puesta al día SQL. Por favor, compruebe que el archivo /install/sql/upgrade no está vacío.';
-$_LANG['Choose the installer language:'] = '¿En qué idioma quiere efectuar la instalación?';
+$_LANG['By default, the PHP \'mail()\' function is used'] = 'Por defecto, se utilizará la función PHP \'mail()\'';
+$_LANG['Can\'t create settings file, if /config/settings.inc.php exists, please give the public write permissions to this file, else please create a file named settings.inc.php in config directory.'] = 'Error en la creación del archivo de configuración, si el archivo /config/settings.inc.php existe, por favor dele derechos púplicos de\escritura; si no, cree un archivo settings.inc.php en el repertorio de configuración (/config/)';
+$_LANG['Can\'t find the sql upgrade files. Please verify that the /install/sql/upgrade folder is not empty)'] = 'Imposible encontrar uno de los archivos de puesta al d√≠a SQL. Por favor, compruebe que el archivo /install/sql/upgrade no está vac√≠o.';
+$_LANG['Choose the installer language:'] = '¬øEn qu√© idioma quiere efectuar la instalación?';
 $_LANG['Community Forum'] = 'en nuestro foro comunitario';
-$_LANG['Configure SMTP manually (advanced users only)'] = 'Configurar el envío SMTP (expertos únicamente)';
+$_LANG['Configure SMTP manually (advanced users only)'] = 'Configurar el env√≠o SMTP (expertos únicamente)';
 $_LANG['Configure your database by filling out the following fields:'] = 'Configure su base de datos rellenando los siguientes campos:';
 $_LANG['Congratulation, your online shop is now ready!'] = '¬°Enhorabuena, su tienda se ha instalado!';
-$_LANG['Contact us'] = '¬°Contacte con nosotros!';
-$_LANG['Create new files and folders allowed'] = 'Creación de nuevas carpetas y archivos autorizados';
-$_LANG['Data integrity is not valided. Hack attempt?'] = 'La integridad de los datos no est√° validada.';
-$_LANG['Database Server is available but database is not found'] = 'La base de datos del servidor est√° disponible, pero la base de datos no se ha encontrado ';
+$_LANG['Contact us!'] = '¬°Contacte con nosotros!';
+$_LANG['Create new files and folders allowed'] = 'Creación de nuevas carpetas y archivos autorizados';
+$_LANG['Data integrity is not valided. Hack attempt?'] = 'La integridad de los datos no está validada.';
+$_LANG['Database Server is available but database is not found'] = 'La base de datos del servidor está disponible, pero la base de datos no se ha encontrado ';
 $_LANG['Database Server is not found. Please verify the login, password and server fields.'] = 'La base de datos de servidor no se ha encontrado, por favor, compruebe sus datos de acceso o el nombre de servidor.';
-$_LANG['Database configuration'] = 'Configuración de la base de datos';
+$_LANG['Database configuration'] = 'Configuración de la base de datos';
 $_LANG['Database connection is available!'] = '¬°La base de datos se ha encontrado!';
 $_LANG['Database is created!'] = '¬°Base de datos instalada!';
 $_LANG['Database name:'] = 'Nombre de la base de datos:';
 $_LANG['Disclaimer'] = 'Aviso';
-$_LANG['Documentation Wiki'] = 'Documentación en Wiki';
-$_LANG['E-mail address:'] = 'Dirección email:';
-$_LANG['E-mail delivery set-up'] = 'Parámetros de envío de emails';
-$_LANG['Encryption:'] = 'Encriptación:';
+$_LANG['Documentation Wiki'] = 'Documentación en Wiki';
+$_LANG['E-mail address:'] = 'Dirección email:';
+$_LANG['E-mail delivery set-up'] = 'Parámetros de env√≠o de emails';
+$_LANG['Encryption:'] = 'Encriptación:';
 $_LANG['Error!'] = '¬°Falta!';
 $_LANG['Error while creating the /config/settings.inc.php file.'] = 'Error al crear el archivo /config/settings.inc.php.';
 $_LANG['Error while inserting content into the database'] = 'Error al insertar en la base de datos';
@@ -44,70 +44,70 @@ $_LANG['Errors while updating...'] = 'Error al actualizar ...';
 $_LANG['Failed to write file to disk'] = 'No se pueden escribir archivos en el disco';
 $_LANG['Fields are different!'] = '¬°Los campos son diferentes!';
 $_LANG['File upload allowed'] = 'Envío de archivo autorizado';
-$_LANG['File upload stopped by extension'] = 'Carga de archivos interrumpido a causa de la extensión incorrecta';
+$_LANG['File upload stopped by extension'] = 'Carga de archivos interrumpido a causa de la extensión incorrecta';
 $_LANG['First name:'] = 'Nombre:';
-$_LANG['For more information, please consult our'] = 'Para más información, consulte nuestra';
+$_LANG['For more information, please consult our'] = 'Para más información, consulte nuestra';
 $_LANG['GD Library installed'] = 'Librería GD instalada';
-$_LANG['GZIP compression is on (recommended)'] = 'La compresión GZIP está activada (aconsejable)';
-$_LANG['Here are your shop information. You can modify them once logged in.'] = 'Aquí tiene sus datos de conexión, puede modificarlos posteriormente si lo desea.';
+$_LANG['GZIP compression is on (recommended)'] = 'La compresión GZIP está activada (aconsejable)';
+$_LANG['Here are your shop information. You can modify them once logged in.'] = 'Aqu√≠ tiene sus datos de conexión, puede modificarlos posteriormente si lo desea.';
 $_LANG['However, you must know how to do the following manually:'] = 'No obstante, puede efectuar las siguientes tareas manualmente:';
 $_LANG['I agree to the above terms and conditions.'] = 'Estoy de acuerdo con los términos y condiciones anteriores.';
 $_LANG['If you have any questions, please visit our '] = 'Si tiene alguna duda o pregunta, eche un vistazo a nuestra ';
 $_LANG['Impossible the access the a MySQL content file.'] = 'No se puede acceder al contenido de un archivo *.sql.';
 $_LANG['Impossible to read the content of a MySQL content file.'] = 'No se puede leer el contenido de un archivo *.sql.';
-$_LANG['Impossible to send the email!'] = '¡No se puede enviar un correo electrónico!';
+$_LANG['Impossible to send the email!'] = '¬°No se puede enviar un correo electrónico!';
 $_LANG['Impossible to upload the file!'] = '¬°No se puede enviar el archivo!';
 $_LANG['Impossible to write the image /img/logo.jpg. If this image already exists, please delete it.'] = 'No se puede escribir la imagen /img/logo.jpg. Si ya existe, por favor, suprímala manualmente.';
-$_LANG['Installation : complete install of the PrestaShop Solution'] = 'Instalación completa de PrestaShop';
-$_LANG['Installation is complete!'] = '¡Instalación terminada! ';
-$_LANG['Installation method'] = 'Modo de instalación';
+$_LANG['Installation : complete install of the PrestaShop Solution'] = 'Instalación completa de PrestaShop';
+$_LANG['Installation is complete!'] = '¬°Instalación terminada! ';
+$_LANG['Installation method'] = 'Modo de instalación';
 $_LANG['Last name:'] = 'Apellido:';
-$_LANG['License Agreement'] = 'Contrato de Licencia';
+$_LANG['Licenses Agreement'] = 'Contrato de Licencia';
 $_LANG['Login:'] = 'Nombre de usuario:';
-$_LANG['Merchant info'] = 'Información sobre el vendedor';
+$_LANG['Merchant info'] = 'Información sobre el vendedor';
 $_LANG['Missing a temporary folder'] = 'Carece de la carpeta temporal para recibir su archivo de correo. ¬°Por favor consulte su administrador de sistema!';
-$_LANG['MySQL support is on'] = 'El soporte de MySQL est√° activado';
+$_LANG['MySQL support is on'] = 'El soporte de MySQL está activado';
 $_LANG['Next'] = 'Siguiente';
 $_LANG['No error code available.'] = 'Error desconocido.';
-$_LANG['No file was uploaded.'] = 'No se ha enviado ning√∫n archivo';
-$_LANG['No upgrade is possible.'] = 'No existe actualización';
+$_LANG['No file was uploaded.'] = 'No se ha enviado ningún archivo';
+$_LANG['No upgrade is possible.'] = 'No existe actualización';
 $_LANG['None'] = 'Ninguno';
 $_LANG['Official forum'] = 'Foro Oficial';
-$_LANG['One or more errors have occurred, you can find more informations below or in the log/installation.log file.'] = ' Se han producido uno o m√°s errores';
+$_LANG['One or more errors have occurred, you can find more informations below or in the log/installation.log file.'] = ' Se han producido uno o más errores';
 $_LANG['Open external URLs allowed'] = 'Apertura autorizada de URL externas';
 $_LANG['Optional languages'] = 'Idiomas opcionales';
-$_LANG['Optional set-up'] = 'Par√°metros opcionales';
-$_LANG['PHP \'mail()\' function is available'] = 'La función PHP \'mail()\' está disponible';
-$_LANG['PHP \'mail()\' function is unavailable'] = 'La función PHP \'mail()\' no está disponible';
+$_LANG['Optional set-up'] = 'Parámetros opcionales';
+$_LANG['PHP \'mail()\' function is available'] = 'La función PHP \'mail()\' está disponible';
+$_LANG['PHP \'mail()\' function is unavailable'] = 'La función PHP \'mail()\' no está disponible';
 $_LANG['PHP 5.0 or later installed'] = 'PHP 5.0 o superior instalado';
-$_LANG['PHP parameters:'] = 'Par√°metros PHP:';
-$_LANG['PHP register global option is off (recommended)'] = 'La opción PHP "register global" está desactivada (aconsejable)';
+$_LANG['PHP parameters:'] = 'Parámetros PHP:';
+$_LANG['PHP register global option is off (recommended)'] = 'La opción PHP "register global" está desactivada (aconsejable)';
 $_LANG['Password:'] = 'Contraseña:';
-$_LANG['Please allow 5-15 minutes to complete the installation process.'] = 'El proceso de instalación tardará tan solo unos minutos.';
+$_LANG['Please allow 5-15 minutes to complete the installation process.'] = 'El proceso de instalación tardará tan solo unos minutos.';
 $_LANG['Please set a SMTP login'] = 'Introduzca un nombre de usuario de SMTP';
 $_LANG['Please set a SMTP password'] = 'Escriba la contraseña SMTP';
 $_LANG['Please set a SMTP server name'] = 'Introduzca un nombre de servidor SMTP';
-$_LANG['Please set a database login'] = 'Introduzca el inicio de sesión de SQL';
+$_LANG['Please set a database login'] = 'Introduzca el inicio de sesión de SQL';
 $_LANG['Please set a database name'] = 'Introduzca el nombre de la base de datos';
 $_LANG['Please set a database server name'] = 'Introduzca el nombre del servidor de la base de datos';
 $_LANG['Port:'] = 'Puerto:';
-$_LANG['PrestaShop %s Installer'] = 'Instalación de PrestaShop %s';
-$_LANG['PrestaShop is ready!'] = '¬°PrestaShop est√° listo!';
+$_LANG['PrestaShop %s Installer'] = 'Instalación de PrestaShop %s';
+$_LANG['PrestaShop is ready!'] = '¬°PrestaShop está listo!';
 $_LANG['Re-type to confirm:'] = 'Confirmar la contraseña:';
-$_LANG['Ready, set, go!'] = '¬°PrestaShop est√° instalado!';
+$_LANG['Ready, set, go!'] = '¬°PrestaShop está instalado!';
 $_LANG['Receive notifications by e-mail'] = 'Recibir sus datos por email';
 $_LANG['Refresh these settings'] = 'Comprobar de nuevo';
 $_LANG['Required field'] = 'Los campos obligatorios';
-$_LANG['Required set-up. Please verify the following checklist items are true.'] = 'Aseg√∫rese por favor de que cada uno de los siguientes par√°metros ha sido validado.';
-$_LANG['SMTP connection is available!'] = '¡Conexión SMTP disponible!';
-$_LANG['SMTP connection is unavailable'] = 'Conexión SMTP no está disponible.';
+$_LANG['Required set-up. Please verify the following checklist items are true.'] = 'Asegúrese por favor de que cada uno de los siguientes parámetros ha sido validado.';
+$_LANG['SMTP connection is available!'] = '¬°Conexión SMTP disponible!';
+$_LANG['SMTP connection is unavailable'] = 'Conexión SMTP no está disponible.';
 $_LANG['SMTP server:'] = 'Servidor SMTP:';
 $_LANG['SQL errors have occurred.'] = 'Han aparecido errores de SQL.';
-$_LANG['Select the different languages available for your shop'] = 'Seleccione los idiomas que su tienda ofrecer√° a los clientes';
+$_LANG['Select the different languages available for your shop'] = 'Seleccione los idiomas que su tienda ofrecerá a los clientes';
 $_LANG['Send me a test email!'] = '¡Envíeme un email de prueba!';
 $_LANG['Server:'] = 'Servidor:';
 $_LANG['Set permissions on folders & subfolders using Terminal or an FTP client'] = 'Poner los permisos en las carpetas y subcarpetas vía un cliente FTP';
-$_LANG['Shop Configuration'] = 'Configuración tienda';
+$_LANG['Shop Configuration'] = 'Configuración tienda';
 $_LANG['Shop logo'] = 'Logo de la tienda';
 $_LANG['Shop name:'] = 'Nombre de la tienda:';
 $_LANG['Shop password:'] = 'Contraseña de la tienda:';
@@ -115,98 +115,98 @@ $_LANG['Shop\'s default language'] = 'Idioma por defecto';
 $_LANG['Shop\'s languages'] = 'Idiomas de la tienda';
 $_LANG['System and permissions'] = 'Sistema y permisos';
 $_LANG['System Compatibility'] = 'Compatibilidad del sistema';
-$_LANG['System Configuration'] = 'Configuración sistema';
+$_LANG['System Configuration'] = 'Configuración sistema';
 $_LANG['Tables prefix:'] = 'Prefijo de las tablas:';
-$_LANG['Test message - Prestashop'] = 'Instalación Prestashop - Prueba del servidor de correo';
-$_LANG['The PrestaShop Installer will do most of the work in just a few clicks.'] = 'El instalador de PrestaShop har√° todo el trabajo en tan solo algunos clics.';
+$_LANG['Test message - Prestashop'] = 'Instalación Prestashop - Prueba del servidor de correo';
+$_LANG['The PrestaShop Installer will do most of the work in just a few clicks.'] = 'El instalador de PrestaShop hará todo el trabajo en tan solo algunos clics.';
 $_LANG['The config/settings.inc.php file was not found. Did you delete or rename this file?'] = 'Config/settings.inc.php no se ha encontrado. ¬øHa eliminado o cambiado de nombre?';
 $_LANG['The password is incorrect (alphanumeric string at least 8 characters).'] = 'Contraseña incorrecta (alfa-cadena numérica de al menos 8 caracteres)';
-$_LANG['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'El archivo enviado supera el tamaño máximo permitido.';
-$_LANG['The uploaded file exceeds the upload_max_filesize directive in php.ini'] = 'El archivo enviado supera el tamaño máximo permitido.';
+$_LANG['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'El archivo enviado supera el tama√±o máximo permitido.';
+$_LANG['The uploaded file exceeds the upload_max_filesize directive in php.ini'] = 'El archivo enviado supera el tama√±o máximo permitido.';
 $_LANG['The uploaded file was only partially uploaded'] = 'El archivo fue parcialmente enviado.';
-$_LANG['There is no older version. Did you delete or rename the config/settings.inc.php file?'] = 'Ninguna versión anterior detectada. ¿Puede borrar o renombrar el archivo de configuración settings.inc.php archivo?';
+$_LANG['There is no older version. Did you delete or rename the config/settings.inc.php file?'] = 'Ninguna versión anterior detectada. ¬øPuede borrar o renombrar el archivo de configuración settings.inc.php archivo?';
 $_LANG['This PrestaShop database already exists. Please revalidate your authentication informations to the database.'] = 'Esta base de datos ya existe PrestaShop, por favor, valide de nuevo sus credenciales en la base de datos.';
-$_LANG['This application need you to activate Javascript to correctly work.'] = 'Se requiere JavaScript para ejecutar esta aplicación.';
-$_LANG['This email adress is wrong!'] = '¡Dirección no válida!';
+$_LANG['This application need you to activate Javascript to correctly work.'] = 'Se requiere JavaScript para ejecutar esta aplicación.';
+$_LANG['This email adress is wrong!'] = '¬°Dirección no válida!';
 $_LANG['This installer is too old.'] = 'Este instalador es demasiado viejo.';
 $_LANG['This is a test message, your server is now available to send email'] = 'Este es un mensaje de prueba, el servidor de correo funciona correctamente.';
-$_LANG['This is not a valid file name.'] = 'Esto no es un nombre v√°lido.';
-$_LANG['This is not a valid image file.'] = 'Esto no es una imagen v√°lida.';
+$_LANG['This is not a valid file name.'] = 'Esto no es un nombre válido.';
+$_LANG['This is not a valid image file.'] = 'Esto no es una imagen válida.';
 $_LANG['Too long!'] = '¬°Demasiado largo!';
 $_LANG['Unfortunately,'] = 'Desgraciadamente,';
-$_LANG['Update is complete!'] = '¡Actualización completa!';
-$_LANG['Upgrade: get the latest stable version!'] = 'Actualización: instale la última versión de PrestaShop';
+$_LANG['Update is complete!'] = '¬°Actualización completa!';
+$_LANG['Upgrade: get the latest stable version!'] = 'Actualización: instale la última versión de PrestaShop';
 $_LANG['Verify now!'] = '¬°Pruebe ahora!';
 $_LANG['Verify system compatibility'] = 'Compatibilidad sistema';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'ATENCION : para m√°s seguridad, por favor suprima la carpeta \'/install\' y los archivos readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG)..';
-$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = '¡Atención: se recomienda hacer una copia de seguridad manual antes de continuar!';
+$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATENCION : para más seguridad, por favor suprima la carpeta \'/install\' y los archivos readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG)..';
+$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = '¬°Atención: se recomienda hacer una copia de seguridad manual antes de continuar!';
 $_LANG['Welcome'] = 'Bienvenido';
-$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenido a la instalación de PrestaShop %s';
-$_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una vez que los archivos de aplicación y su base de datos se hayan guardado, le pediremos que los certifique. Por lo tanto, usted asume plenamente su responsabilidad por cualquier pérdida de datos debido a la actualización de la aplicación PrestaShop.';
+$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenido a la instalación de PrestaShop %s';
+$_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una vez que los archivos de aplicación y su base de datos se hayan guardado, le pediremos que los certifique. Por lo tanto, usted asume plenamente su responsabilidad por cualquier p√©rdida de datos debido a la actualización de la aplicación PrestaShop.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'en escritura en las carpetas (y sus subcarpetas) :';
 $_LANG['Write permissions on files and folders:'] = 'Derechos en escritura en los archivos y carpetas :';
 $_LANG['Write permissions on folders:'] = 'Permiso de escritura en los archivos de';
-$_LANG['You already have the %s version.'] = 'Ya está en posesión de la versión %s';
+$_LANG['You already have the %s version.'] = 'Ya está en posesión de la versión %s';
 $_LANG['You have just installed and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Acaba de instalar y de configurar su tienda en línea y se lo agradecemos.';
 $_LANG['You have just updated and configured PrestaShop as your online shop solution. We wish you all the best with the success of your online shop.'] = 'Deba actualizar su tienda en línea. Se lo agradecemos.';
-$_LANG['Your installation is finished!'] = '¡La instalación está terminada!';
-$_LANG['Your update is finished!'] = 'La actualización se ha completado';
+$_LANG['Your installation is finished!'] = '¬°La instalación está terminada!';
+$_LANG['Your update is finished!'] = 'La actualización se ha completado';
 $_LANG['and/or'] = 'y/o';
 $_LANG['enter@your.email'] = 'introduzca@su.email';
-$_LANG['online documentation'] = 'documentación en línea';
-$_LANG['installed version detected'] = 'versión detectada actualmente';
+$_LANG['online documentation'] = 'documentación en l√≠nea';
+$_LANG['installed version detected'] = 'versión detectada actualmente';
 $_LANG['recommended dimensions: 230px X 75px'] = 'Dimensiones aconsajables: 230px x 75px';
 $_LANG['view the log'] = 'ver el informe';
-$_LANG['(no old version detected)'] = '(no hay ninguna versión antigua detectada)';
-$_LANG['Can\'t write settings file, please create a file named settings.inc.php in config directory.'] = 'El archivo de parámetros no pudo escribirse, cree un archivo llamado settings.inc.php en su repertorio de configuración.';
+$_LANG['(no old version detected)'] = '(no hay ninguna versión antigua detectada)';
+$_LANG['Can\'t write settings file, please create a file named settings.inc.php in config directory.'] = 'El archivo de parámetros no pudo escribirse, cree un archivo llamado settings.inc.php en su repertorio de configuración.';
 $_LANG['Cannot convert your database\'s data to utf-8.'] = 'No se pueden convertir los datos de su base de datos en UTF-8.';
 $_LANG['Your database server does not support the utf-8 charset.'] = 'La base de datos del servidor no es compatible con UTF-8.';
 $_LANG['Need help?'] = '¬øNecesita ayuda?';
 $_LANG['Forum'] = 'El foro';
 $_LANG['Blog'] = 'El blog';
 $_LANG['Back Office'] = 'Back Office';
-$_LANG['Manage your store with your back office. Manage your orders and customers, add modules, change your theme, etc...'] = 'Administre su tienda con su back office. Gestione pedidos y clientes, agregue módulos, cambie el tema, etc ...';
+$_LANG['Manage your store with your back office. Manage your orders and customers, add modules, change your theme, etc...'] = 'Administre su tienda con su back office. Gestione pedidos y clientes, agregue módulos, cambie el tema, etc ...';
 $_LANG['Manage your store'] = 'Administre su tienda';
 $_LANG['Front Office'] = 'Front Office';
-$_LANG['Find your store as your future customers will see!'] = '¬°Descubra su tienda tal como la ver√°n sus clientes!';
+$_LANG['Find your store as your future customers will see!'] = '¬°Descubra su tienda tal como la verán sus clientes!';
 $_LANG['Discover your store'] = 'Descubra su tienda';
 $_LANG['Did you know?'] = '¿Sabía que?';
-$_LANG['Prestashop and community offers over 40 different languages for free download on'] = 'La comunidad Prestashop ofrece m√°s de 40 idiomas diferentes para su descarga gratuita en';
+$_LANG['Prestashop and community offers over 40 different languages for free download on'] = 'La comunidad Prestashop ofrece más de 40 idiomas diferentes para su descarga gratuita en';
 $_LANG['Default country:'] = 'País por defecto:';
 $_LANG['Shop\'s timezone:'] = 'Zona horaria de la tienda:';
-$_LANG['Your configuration is valid, click next to continue!'] = 'Su configuración es válida, haga clic en Siguiente para continuar';
-$_LANG['Your configuration is invalid. Please fix the issues below:'] = 'Su configuración no es válida,<br />gracias por corregir la configuración:';
+$_LANG['Your configuration is valid, click next to continue!'] = 'Su configuración es válida, haga clic en Siguiente para continuar';
+$_LANG['Your configuration is invalid. Please fix the issues below:'] = 'Su configuración no es válida,<br />gracias por corregir la configuración:';
 $_LANG['You have to create a database, help available in readme_en.txt'] = 'Debe crear una base de datos, puede encontrar ayuda en el archivo readme_es.txt';
 $_LANG['Discover your store'] = 'Descubra su tienda';
-$_LANG['If you check this box and your mail configuration is wrong, your installation might be blocked. If so, please uncheck the box to go to the next step.'] = 'Esta opción se puede bloquear si su configuración de correo electrónico está mal, gracias a desactivarla si usted no puede moverse a la siguiente etapa.';
-$_LANG['A question about PrestaShop or issues during installation or upgrade? Call us!'] = '¿Alguna pregunta sobre PrestaShop o problemas durante su instalación o actualización? ¡Llámenos!';
-$_LANG['Invalid catalog mode'] = 'Campo modo cat√°logo no v√°lido';
-$_LANG['Catalog mode:'] = 'Modo Cat√°logo:';
+$_LANG['If you check this box and your mail configuration is wrong, your installation might be blocked. If so, please uncheck the box to go to the next step.'] = 'Esta opción se puede bloquear si su configuración de correo electrónico está mal, gracias a desactivarla si usted no puede moverse a la siguiente etapa.';
+$_LANG['A question about PrestaShop or issues during installation or upgrade? Call us!'] = '¬øAlguna pregunta sobre PrestaShop o problemas durante su instalación o actualización? ¬°Llámenos!';
+$_LANG['Invalid catalog mode'] = 'Campo modo catálogo no válido';
+$_LANG['Catalog mode:'] = 'Modo Catálogo:';
 $_LANG['Yes'] = 'Sí';
 $_LANG['No'] = 'No';
-$_LANG['If you activate this feature, all purchase features will be disabled. You can activate this feature later in your back office'] = 'Si activa esta opción, se desactivarán todas las aplicaciones de compra. Puede activar dicha opción posteriormente en el panel de administración.';
+$_LANG['If you activate this feature, all purchase features will be disabled. You can activate this feature later in your back office'] = 'Si activa esta opción, se desactivarán todas las aplicaciones de compra. Puede activar dicha opción posteriormente en el panel de administración.';
 $_LANG['the already installed version detected is too recent, no update available'] = 'la versi‚àö‚â•n instalada que se ha detectado es demasiado reciente, no hay ninguna actualizaci‚àö‚â•n disponible';
-$_LANG['If you do not know how to enable it, use our turnkey solution PrestaBox at'] = 'Si no sabe activarla, utilice nuestra solución PrestaBox en';
-$_LANG['Invalid shop name'] = 'Nombre de la tienda no v√°lido';
-$_LANG['Your firstname contains some invalid characters'] = 'Su nombre contiene caracteres no v√°lidos';
-$_LANG['Your lastname contains some invalid characters'] = 'Su apellido contiene caracteres no v√°lidos';
+$_LANG['If you do not know how to enable it, use our turnkey solution PrestaBox at'] = 'Si no sabe activarla, utilice nuestra solución PrestaBox en';
+$_LANG['Invalid shop name'] = 'Nombre de la tienda no válido';
+$_LANG['Your firstname contains some invalid characters'] = 'Su nombre contiene caracteres no válidos';
+$_LANG['Your lastname contains some invalid characters'] = 'Su apellido contiene caracteres no válidos';
 $_LANG['Your MySQL server doesn\'t support this engine, please use another one like MyISAM'] = 'El soporte de este motor de base de datos no se puede soportar, elija otro como por ejemplo MyISAM';
-$_LANG['The file /img/logo.jpg is not writable, please CHMOD 755 this file or CHMOD 777'] = 'El archivo /img/logo.jpg no tiene derechos de escritura, por favor efect√∫e un CHMOD 755 o 777 en el archivo';
-$_LANG['The config/defines.inc.php file was not found. Where did you move it?'] = 'El archivo config/defines.inc.php no se ha encontrado. ¿Dónde se encuentra?';
+$_LANG['The file /img/logo.jpg is not writable, please CHMOD 755 this file or CHMOD 777'] = 'El archivo /img/logo.jpg no tiene derechos de escritura, por favor efectúe un CHMOD 755 o 777 en el archivo';
+$_LANG['The config/defines.inc.php file was not found. Where did you move it?'] = 'El archivo config/defines.inc.php no se ha encontrado. ¬øDónde se encuentra?';
 $_LANG['All tips and advice about PrestaShop'] = 'Todos los trucos y consejos sobre PrestaShop';
 $_LANG['+33 (0)1.40.18.30.04'] = '+33 (0)1.40.18.30.04';
-$_LANG['the already installed version detected is too old, no more update available'] = 'la versión instalada es demasiado antigua, no existen actualizaciones.';
-$_LANG['Mcrypt is available (recommended)'] = 'Mcrypt est√° disponible (aconsejable)';
-$_LANG['If you do not know how to fix these issues, use turnkey solution PrestaBox at'] = 'Si no puede solucionar estos problemas, utilice nuestra solución  PrestaBox en';
+$_LANG['the already installed version detected is too old, no more update available'] = 'la versión instalada es demasiado antigua, no existen actualizaciones.';
+$_LANG['Mcrypt is available (recommended)'] = 'Mcrypt está disponible (aconsejable)';
+$_LANG['If you do not know how to fix these issues, use turnkey solution PrestaBox at'] = 'Si no puede solucionar estos problemas, utilice nuestra solución  PrestaBox en';
 $_LANG['Database Engine:'] = 'Tipo de base de datos:';
-$_LANG['Installation type'] = 'Tipo de instalación';
-$_LANG['Simple mode: Basic installation'] = 'Modo básico: instalación simplificada';
+$_LANG['Installation type'] = 'Tipo de instalación';
+$_LANG['Simple mode: Basic installation'] = 'Modo básico: instalación simplificada';
 $_LANG['(FREE)'] = '(GRATIS)';
 $_LANG['Full mode: includes'] = 'Modo completo: incluido';
-$_LANG['100+ additional modules'] = '100 módulos';
-$_LANG['and demo products'] = 'y productos de demostración';
+$_LANG['100+ additional modules'] = '100 módulos';
+$_LANG['and demo products'] = 'y productos de demostración';
 $_LANG['(FREE too!)'] = '(¬°TAMBIEN GRATIS!)';
-$_LANG['Shop configuration'] = 'Configuración de la tienda';
+$_LANG['Shop configuration'] = 'Configuración de la tienda';
 $_LANG['Main activity:'] = 'Actividad principal';
 $_LANG['-- Please choose your main activity --'] = '-- Elija una actividad --';
 $_LANG['Adult'] = 'Adulto y lencería';
@@ -214,29 +214,29 @@ $_LANG['Animals and Pets'] = 'Animales';
 $_LANG['Art and Culture'] = 'Cultura y ocio';
 $_LANG['Babies'] = 'Artículos para bebés';
 $_LANG['Beauty and Personal Care'] = 'Salud y belleza';
-$_LANG['Cars'] = 'Automóvil y motos';
-$_LANG['Computer Hardware and Software'] = 'Inform√°tica y programas';
+$_LANG['Cars'] = 'Automóvil y motos';
+$_LANG['Computer Hardware and Software'] = 'Informática y programas';
 $_LANG['Download'] = 'Descargas';
 $_LANG['Fashion and accessories'] = 'Ropa y complementos';
 $_LANG['Flowers, Gifts and Crafts'] = 'Flores y regalos';
-$_LANG['Food and beverage'] = 'Alimentación y gastronomía';
+$_LANG['Food and beverage'] = 'Alimentación y gastronom√≠a';
 $_LANG['HiFi, Photo and Video'] = 'Hifi, foto y vídeo';
 $_LANG['Home and Garden'] = 'Casa y jardín';
 $_LANG['Home Appliances'] = 'Electrodomésticos';
 $_LANG['Jewelry'] = 'Joyería';
-$_LANG['Mobile and Telecom'] = 'Telefonía y comunicación';
+$_LANG['Mobile and Telecom'] = 'Telefon√≠a y comunicación';
 $_LANG['Services'] = 'Servicios';
 $_LANG['Shoes and accessories'] = 'Calzado y complementos';
 $_LANG['Sport and Entertainment'] = 'Deporte y ocio';
 $_LANG['Travel'] = 'Viajes y turismo';
-$_LANG['This information isn\'t required, it will be used for statistical purposes. This information doesn\'t 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.';
+$_LANG['This information isn\'t required, it will be used for statistical purposes. This information doesn\'t 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.';
 $_LANG['E-mail:'] = 'Email :';
-$_LANG['I certify that I backed up my database and application files. I assume all responsibility for any data loss or damage related to this upgrade.'] = 'Certifico que he efectuado una copia de seguridad de mi base de datos y de mis archivos. Asumo plenamente la responsabilidad en caso en que se pierdan los datos o se produzca un error relacionado con esta actualización.';
-$_LANG['Upgrade in progress'] = 'Actualización en curso';
-$_LANG['Current query:'] = 'B√∫squeda actual:';
-$_LANG['Details about this upgrade'] = 'Detalles sobre esta actualización';
-$_LANG['Thank you, you will be able to continue the upgrade process by clicking on the "Next" button.'] = 'Gracias, puede continuar la actualización, pulsando en "Siguiente".';
-$_LANG['PrestaShop is upgrading your shop one version after the other, the following upgrade files will be processed:'] = 'PrestaShop actualiza las versiones de su tienda de una en una, los siguientes archivos de actualización van a ser tratados:';
+$_LANG['I certify that I backed up my database and application files. I assume all responsibility for any data loss or damage related to this upgrade.'] = 'Certifico que he efectuado una copia de seguridad de mi base de datos y de mis archivos. Asumo plenamente la responsabilidad en caso en que se pierdan los datos o se produzca un error relacionado con esta actualización.';
+$_LANG['Upgrade in progress'] = 'Actualización en curso';
+$_LANG['Current query:'] = 'Búsqueda actual:';
+$_LANG['Details about this upgrade'] = 'Detalles sobre esta actualización';
+$_LANG['Thank you, you will be able to continue the upgrade process by clicking on the "Next" button.'] = 'Gracias, puede continuar la actualización, pulsando en "Siguiente".';
+$_LANG['PrestaShop is upgrading your shop one version after the other, the following upgrade files will be processed:'] = 'PrestaShop actualiza las versiones de su tienda de una en una, los siguientes archivos de actualización van a ser tratados:';
 $_LANG['Upgrade file'] = 'Archivo de actualizaciones';
 $_LANG['Modifications to process'] = 'Modificaciones que deben tenerse en cuenta';
 $_LANG['(major)'] = '(majeure)';
@@ -247,42 +247,42 @@ $_LANG['minutes'] = 'minutos';
 $_LANG['minute'] = 'minuto';
 $_LANG['seconds'] = 'segundos';
 $_LANG['second'] = 'segundo';
-$_LANG['Depending on your server and the size of your shop'] = 'En función de la potencia de su servidor y el tamaño de su tienda...';
-$_LANG['You did not update your shop for a while,'] = 'No ha actualizado su tienda desde hace alg√∫n tiempo,';
-$_LANG['stable releases have been made ​​available since.'] = 'hay versiones mayores a disposición desde entonces.';
-$_LANG['This is not a problem however the update may take several minutes, try to update your shop more frequently.'] = 'No es un problema pero la actualización puede durar algunos minutos. Intente actualizar su tienda más a menudo.';
-$_LANG['No files to process, this might be an error.'] = 'No hay ning√∫n archivo para tratar, se trata sin duda de un error';
-$_LANG['Hosting parameters'] = 'Par√°metros hosting';
-$_LANG['PrestaShop tries to automatically set the best settings for your server in order the update to be successful.'] = 'PrestaShop intenta configurar por usted los parámetros de su servidor para que la actualización se efectúe de manera correcta.';
-$_LANG['PHP parameter'] = 'Par√°metro PHP';
-$_LANG['Description'] = 'Descripción';
+$_LANG['Depending on your server and the size of your shop'] = 'En función de la potencia de su servidor y el tama√±o de su tienda...';
+$_LANG['You did not update your shop for a while,'] = 'No ha actualizado su tienda desde hace algún tiempo,';
+$_LANG['stable releases have been made ‚Äã‚Äãavailable since.'] = 'hay versiones mayores a disposición desde entonces.';
+$_LANG['This is not a problem however the update may take several minutes, try to update your shop more frequently.'] = 'No es un problema pero la actualización puede durar algunos minutos. Intente actualizar su tienda más a menudo.';
+$_LANG['No files to process, this might be an error.'] = 'No hay ningún archivo para tratar, se trata sin duda de un error';
+$_LANG['Hosting parameters'] = 'Parámetros hosting';
+$_LANG['PrestaShop tries to automatically set the best settings for your server in order the update to be successful.'] = 'PrestaShop intenta configurar por usted los parámetros de su servidor para que la actualización se efectúe de manera correcta.';
+$_LANG['PHP parameter'] = 'Parámetro PHP';
+$_LANG['Description'] = 'Descripción';
 $_LANG['Current value'] = 'Valor actual';
-$_LANG['Maximum allowed time for the upgrade'] = 'Tiempo máximo autorizado para la actualización';
-$_LANG['Maximum memory allowed for the upgrade'] = 'Memoria máxima autorizada para la actualización';
-$_LANG['All your settings seem to be OK, go for it!'] = 'Todos los par√°metros son correctos, ¬°adelante!';
-$_LANG['Beware, your settings look correct but are not optimal, if you encounter problems (upgrade too long, memory error...), please ask your hosting provider to increase the values of these parameters (max_execution_time & memory_limit).'] = 'Atención, los parámetros parecen correctos pero no son óptimos, si encuentra una dificultad (actualización bloqueada antes de su finalización, error de memoria...), pida a su hosting que aumente los valores de dichos parámetros (max_execution_time & memory_limit).';
-$_LANG['We strongly recommend that you inform your hosting provider to modify the settings before process to the update.'] = 'Le aconsejamos que avise a su hosting antes de comenzar la actualización para que modifique los parámetros PHP.';
+$_LANG['Maximum allowed time for the upgrade'] = 'Tiempo máximo autorizado para la actualización';
+$_LANG['Maximum memory allowed for the upgrade'] = 'Memoria máxima autorizada para la actualización';
+$_LANG['All your settings seem to be OK, go for it!'] = 'Todos los parámetros son correctos, ¬°adelante!';
+$_LANG['Beware, your settings look correct but are not optimal, if you encounter problems (upgrade too long, memory error...), please ask your hosting provider to increase the values of these parameters (max_execution_time & memory_limit).'] = 'Atención, los parámetros parecen correctos pero no son óptimos, si encuentra una dificultad (actualización bloqueada antes de su finalización, error de memoria...), pida a su hosting que aumente los valores de dichos parámetros (max_execution_time & memory_limit).';
+$_LANG['We strongly recommend that you inform your hosting provider to modify the settings before process to the update.'] = 'Le aconsejamos que avise a su hosting antes de comenzar la actualización para que modifique los parámetros PHP.';
 $_LANG['Let\'s go!'] = 'El proceso ha comenzado';
-$_LANG['Click on the "Next" button to start the upgrade, this can take several minutes,'] = 'Pulse en "Siguiente" para comenzar la actualización, esto puede llevar unos minutos,';
+$_LANG['Click on the "Next" button to start the upgrade, this can take several minutes,'] = 'Pulse en "Siguiente" para comenzar la actualización, esto puede llevar unos minutos,';
 $_LANG['do not close the window and be patient.'] = 'no cierre la ventana y espere.';
-$_LANG['Your update is completed!'] = 'La actualización ha concluido con éxito';
-$_LANG['Your shop version is now'] = 'La versión de su tienda ya está';
+$_LANG['Your update is completed!'] = 'La actualización ha concluido con √©xito';
+$_LANG['Your shop version is now'] = 'La versión de su tienda ya está';
 $_LANG['New features in PrestaShop v'] = 'Nuevas aplicaciones en dans PrestaShop v';
-$_LANG['Module compatibility'] = 'Compatibilidad Módulos';
-$_LANG['It\'s dangerous to keep non-native modules activated during the update. If you really want to take this risk, uncheck the following box.'] = 'Se desaconseja dejar los módulos no nativos activos durante la actualización. Si realmente desea correr ese riesgo, desactive la siguiente casilla.';
-$_LANG['You will be able to manually reactivate them in your back-office, once the update process has succeeded.'] = 'Después podrá reactivarlos manualmente en el back-office, una vez la actualización haya terminado.';
-$_LANG['Ok, please desactivate the following modules, I will reactivate them later:'] = 'De acuerdo, desactive automáticamente los siguientes módulos, los activaré yo mismo más tarde:';
+$_LANG['Module compatibility'] = 'Compatibilidad Módulos';
+$_LANG['It\'s dangerous to keep non-native modules activated during the update. If you really want to take this risk, uncheck the following box.'] = 'Se desaconseja dejar los módulos no nativos activos durante la actualización. Si realmente desea correr ese riesgo, desactive la siguiente casilla.';
+$_LANG['You will be able to manually reactivate them in your back-office, once the update process has succeeded.'] = 'Despu√©s podrá reactivarlos manualmente en el back-office, una vez la actualización haya terminado.';
+$_LANG['Ok, please desactivate the following modules, I will reactivate them later:'] = 'De acuerdo, desactive automáticamente los siguientes módulos, los activar√© yo mismo más tarde:';
 $_LANG['Theme compatibility'] = 'Compatibilidad del tema';
-$_LANG['Before updating, you need to check that your theme is compatible with version'] = 'Antes de la actualización, debe comprobar que su tema es compatible con la versión';
+$_LANG['Before updating, you need to check that your theme is compatible with version'] = 'Antes de la actualización, debe comprobar que su tema es compatible con la versión';
 $_LANG['of PrestaShop.'] = 'de PrestaShop';
 $_LANG['Link to the validator'] = 'Link hacia el validador';
 $_LANG['Online Theme Validator'] = 'Validador del tema en línea';
-$_LANG['If your theme is not valid, you may experience some problems in your front-office aspect, but don\'t panic ! To solve this, you can make it compatible by correcting the validators errors or by using a theme compatible with '] = 'Si su tema no es válido, podría tener problemas en la página de su sitio Web, pero no se preocupe, ¡puede hacerlo compatible corrigiendo los errores señalados por el validador o utilizando un tema compatible con la versión!' ;
-$_LANG['version'] = 'versión';
+$_LANG['If your theme is not valid, you may experience some problems in your front-office aspect, but don\'t panic ! To solve this, you can make it compatible by correcting the validators errors or by using a theme compatible with '] = 'Si su tema no es válido, podr√≠a tener problemas en la página de su sitio Web, pero no se preocupe, ¬°puede hacerlo compatible corrigiendo los errores se√±alados por el validador o utilizando un tema compatible con la versión!' ;
+$_LANG['version'] = 'versión';
 $_LANG['In this aim, use our'] = 'En este objetivo, utilice nuestro';
 $_LANG['Additional Benefits'] = 'Otros beneficios';
 $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Ofertas exclusivas dedicadas a los comerciantes PrestaShop';
-$_LANG['PHP magic quotes option is off (recommended)'] = 'La opción PHP "magic quotes" está desactivada (aconsejable)';
+$_LANG['PHP magic quotes option is off (recommended)'] = 'La opción PHP "magic quotes" está desactivada (aconsejable)';
 $_LANG['Other activity...'] = 'Otra actividad...';
 $_LANG['Modules'] = 'Módulos';
 $_LANG['Benefits'] = 'Beneficios';
\ No newline at end of file
diff --git a/install-dev/langs/fr.php b/install-dev/langs/fr.php
index e3508741e..c4e5f22e1 100644
--- a/install-dev/langs/fr.php
+++ b/install-dev/langs/fr.php
@@ -141,7 +141,7 @@ $_LANG['Update is complete!'] = 'Mise à jour terminée !';
 $_LANG['Upgrade: get the latest stable version!'] = 'Mise à jour : installez la dernière version de PrestaShop';
 $_LANG['Verify now!'] = 'Tester la connexion';
 $_LANG['Verify system compatibility'] = 'Compatibilité système';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\' et les fichiers readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
+$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\' et les fichiers readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attention : une sauvegarde manuelle est INDISPENSABLE avant de procéder à la mise à jour de l\'application PrestaShop, cela afin de prévenir toute perte de données accidentelle';
 $_LANG['Welcome'] = 'Bienvenue';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenue dans l\'installation de PrestaShop %s';
diff --git a/install-dev/langs/it.php b/install-dev/langs/it.php
index 7e87c0eca..e527377bd 100644
--- a/install-dev/langs/it.php
+++ b/install-dev/langs/it.php
@@ -20,7 +20,7 @@ $_LANG['Community Forum'] = 'il nostro forum comune';
 $_LANG['Configure SMTP manually (advanced users only)'] = 'Configura l\'invio SMTP (solo per utenti esperti)';
 $_LANG['Configure your database by filling out the following fields:'] = 'Configura il tuo database riempiendo i campi qui sotto:';
 $_LANG['Congratulation, your online shop is now ready!'] = 'Congratulazioni, il tuo negozio è installato!';
-$_LANG['Contact us'] = 'Contattaci!';
+$_LANG['Contact us!'] = 'Contattaci!';
 $_LANG['Create new files and folders allowed'] = 'Autorizzato a creare nuovi file e cartelle';
 $_LANG['Data integrity is not valided. Hack attempt?'] = 'L\'integrità dei dati non è convalidata.';
 $_LANG['Database Server is available but database is not found'] = 'Il server del database è disponibile ma il database non è stato trovato.';
@@ -63,7 +63,7 @@ $_LANG['Installation : complete install of the PrestaShop Solution'] = 'Installa
 $_LANG['Installation is complete!'] = 'Installazione terminata!';
 $_LANG['Installation method'] = 'Metodo di installazione';
 $_LANG['Last name:'] = 'Cognome:';
-$_LANG['License Agreement'] = 'Contratto di Licenza';
+$_LANG['Licenses Agreement'] = 'Contratto di Licenza';
 $_LANG['Login:'] = 'ID';
 $_LANG['Merchant info'] = 'Informazioni sul venditore';
 $_LANG['Missing a temporary folder'] = 'Manca la cartella temporanea di ricezione dell\'invio di file. Consulta il tuo amministratore.';
@@ -140,7 +140,7 @@ $_LANG['Update is complete!'] = 'Aggiornamento terminato!';
 $_LANG['Upgrade: get the latest stable version!'] = 'Aggiornamento installa l\'ultima versione di PrestaShop';
 $_LANG['Verify now!'] = 'Prova la connessione SQL';
 $_LANG['Verify system compatibility'] = 'Compatibilità sistema';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\'  e i file readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
+$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\'  e i file readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attenzione: E\' FONDAMENTALE un backup manuale prima di continuare l\'aggiornamento dell\'applicazione Prestashop, al fine di evitare la perdita accidentale di dati.';
 $_LANG['Welcome'] = 'Benvenuto';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Benvenuto nell\'installazione di PrestaShop %s';
@@ -179,7 +179,7 @@ $_LANG['Default country:'] = 'Nazione di default:';
 $_LANG['Shop\'s timezone:'] = 'Fuso orario del negozio:';
 $_LANG['Your configuration is valid, click next to continue!'] = 'La tua configurazione è valida,<br />clicca su successivo per continuare!';
 $_LANG['Your configuration is invalid. Please fix the issues below:'] = 'La tua configurazione non è valida,<br />correggi questi problemi:';
-$_LANG['You have to create a database, help available in readme_en.txt'] = 'Devi prima creare un database (aiuto disponibile nel file readme.txt)';
+$_LANG['You have to create a database, help available in readme_en.txt'] = 'Devi prima creare un database (aiuto disponibile nel file readme_it.txt)';
 $_LANG['If you check this box and your mail configuration is wrong, your installation might be blocked. If so, please uncheck the box to go to the next step.'] = 'Se la tua configurazione e-mail è errata, questa opzione può essere bloccata; disattivala se non puoi passare alla fase successiva.';
 $_LANG['Mcrypt is available (recommended)'] = 'Mcrypt è disponibile (consigliato)';
 $_LANG['Your MySQL server doesn\'t support this engine, please use another one like MyISAM'] = 'Il supporto di questo motore di database non è supportato, scegline un altro come MyISAM';
@@ -272,4 +272,4 @@ $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Offerte esclusiv
 $_LANG['PHP magic quotes option is off (recommended)'] = 'Opzione magic quotes PHP è disattivata (consigliato)';
 $_LANG['Other activity...'] = 'Altre attività ...';
 $_LANG['Modules'] = 'Moduli';
-$_LANG['Benefits'] = 'Vantaggi';
\ No newline at end of file
+$_LANG['Benefits'] = 'Vantaggi';
diff --git a/install-dev/langs/list.xml b/install-dev/langs/list.xml
index a41934cd5..0e9c067a1 100644
--- a/install-dev/langs/list.xml
+++ b/install-dev/langs/list.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <languages>
-	
 	<lang id="0" label="English" trad_file="/../langs/us.php">
 		<flags>
 			<url>../img/l/1.jpg</url>
diff --git a/install-dev/langs/us.php b/install-dev/langs/us.php
index e8a1ffbfd..71273f32d 100644
--- a/install-dev/langs/us.php
+++ b/install-dev/langs/us.php
@@ -64,7 +64,7 @@ $_LANG['This is not a valid image file.'] = 'Invalid image file';
 $_LANG['Too long!'] = 'Too long';
 $_LANG['Upgrade: get the latest stable version!'] = 'Update: Get the latest stable version';
 $_LANG['Verify system compatibility'] = 'System Compatibility';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'WARNING! For security reasons, you must now delete the \'install\' folder located on your hosting server.';
+$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'WARNING! A manual backup is HIGHLY recommended before continuing.';
 $_LANG['Welcome'] = 'Welcome!';
 $_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Welcome to the PrestaShop™ v'.INSTALL_VERSION.' Installer wizard.';
diff --git a/install-dev/preactivation.php b/install-dev/preactivation.php
index 2a9579887..a58b62e9a 100644
--- a/install-dev/preactivation.php
+++ b/install-dev/preactivation.php
@@ -26,6 +26,8 @@
 			if ($result)
 			{
 				$varList = "";
+				if (count($result->field) > 0)
+				{
 				echo '<br clear="left" /><hr /><br clear="left" />';
 				foreach ($result->field AS $field)
 				{
@@ -67,6 +69,7 @@
 					else
 						$varList .= "'&".$field->key."='+ encodeURIComponent($('#".$p."_".$c."_form_".$field->key."').val())+\n";
 				}
+				}
 				echo '
 				<script>'."
 					$('#btNext').click(function() {
diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql
index ba3ddbece..e60538135 100644
--- a/install-dev/sql/db_settings_lite.sql
+++ b/install-dev/sql/db_settings_lite.sql
@@ -70,11 +70,12 @@ INSERT INTO `PREFIX_hook` (`id_hook`, `name`, `title`, `description`, `position`
 (67, 'attributeGroupForm', 'Add fileds to the form "attribute group"', 'Add fileds to the form "attribute group"', 0, 0),
 (68, 'afterSaveAttributeGroup', 'On saving attribute group', 'On saving attribute group', 0, 0),
 (69, 'afterDeleteAttributeGroup', 'On deleting attribute group', 'On deleting attribute group', 0, 0),
-(70, 'featureForm', 'Add fileds to the form "feature"', 'Add fileds to the form "feature"', 0, 0),
+(70, 'featureForm', 'Add fields to the form "feature"', 'Add fields to the form "feature"', 0, 0),
 (71, 'afterSaveFeature', 'On saving attribute feature', 'On saving attribute feature', 0, 0),
 (72, 'afterDeleteFeature', 'On deleting attribute feature', 'On deleting attribute feature', 0, 0),
-(73, 'taxManager', 'Tax Manager Factory', '' , 0, 0);
-
+(73, 'taxManager', 'Tax Manager Factory', '' , 0, 0),
+(74, 'afterSaveProduct', 'On saving products', 'On saving products', 0, 0),
+(75, 'productListAssign', 'Assign product list to a category', 'Assign product list to a category', 0, 0);
 
 INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_add`, `date_upd`) VALUES
 (1, 'PS_LANG_DEFAULT', '1', NOW(), NOW()),
@@ -826,8 +827,8 @@ INSERT INTO `PREFIX_tab` (`id_tab`, `class_name`, `id_parent`, `position`) VALUE
 (53, 'AdminBackup', 9, 8),(57, 'AdminCMSContent', 9, 9),(64, 'AdminGenerator', 9, 10),(43, 'AdminSearch', -1, 0),(69, 'AdminInformation', 9, 11),
 (70, 'AdminPerformance', 8, 11),(71, 'AdminCustomerThreads', 29, 4),(72, 'AdminWebservice', 9, 12),(73, 'AdminStockMvt', 1, 9),
 (80, 'AdminAddonsCatalog', 7, 1),(81, 'AdminAddonsMyAccount', 7, 2),(83, 'AdminThemes', 7, 3),(84, 'AdminGeolocation', 8, 12),
-(85, 'AdminTaxRulesGroup', 4, 3),(86, 'AdminLogs', 9, 13), (87,'AdminHome',-1,0),(88,'AdminUpgrade',9,14),
-(89,'AdminShop', 0, 11), (90,'AdminGroupShop', 90, 1),(91, 'AdminShopUrl', 90, 2);
+(85, 'AdminTaxRulesGroup', 4, 3),(86, 'AdminLogs', 9, 13), (87,'AdminHome',-1,0),
+(88,'AdminShop', 0, 11), (89,'AdminGroupShop', 90, 1),(90, 'AdminShopUrl', 90, 2);
 
 INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 1, id_tab, 1, 1, 1, 1 FROM PREFIX_tab);
 
@@ -844,7 +845,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (1, 61, 'Search Engines'),(1, 62, 'Referrers'),(1, 63, 'Groups'),(1, 64, 'Generators'),(1, 65, 'Shopping Carts'),(1, 66, 'Tags'),(1, 67, 'Search'),
 (1, 68, 'Attachments'),(1, 69, 'Configuration Information'),(1, 70, 'Performance'),(1, 71, 'Customer Service'),(1, 72, 'Webservice'),(1, 73, 'Stock Movements'),
 (1, 80, 'Modules & Themes Catalog'),(1, 81, 'My Account'),(1, 82, 'Stores'),(1, 83, 'Themes'),(1, 84, 'Geolocation'),(1, 85, 'Tax Rules'),(1, 86, 'Log'),
-(1, 87, 'Home'),(1, 88, 'Upgrade'), (1, 89, 'Shops'), (1, 90, 'Group Shops'), (1, 91, 'Shop Urls');
+(1, 87, 'Home'), (1, 88, 'Shops'), (1, 89, 'Group Shops'), (1, 90, 'Shop Urls');
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (2, 1, 'Catalogue'),(2, 2, 'Clients'),(2, 3, 'Commandes'),(2, 4, 'Paiement'),(2, 5, 'Transport'),
@@ -859,7 +860,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (2, 62, 'Sites affluents'),(2, 63, 'Groupes'),(2, 64, 'Générateurs'),(2, 65, 'Paniers'),(2, 66, 'Tags'),(2, 67, 'Recherche'),
 (2, 68, 'Documents joints'),(2, 69, 'Informations'),(2, 70, 'Performances'),(2, 71, 'SAV'),(2, 72, 'Service web'),(2, 73, 'Mouvements de Stock'),
 (2, 80, 'Catalogue de modules et thèmes'),(2, 81, 'Mon compte'),(2, 82, 'Magasins'),(2, 83, 'Thèmes'),(2, 84, 'Géolocalisation'),(2, 85, 'Règles de taxes'),(2, 86, 'Log'),
-(2, 87,'Accueil'),(2, 88, 'Mise à jour'), (2, 89, 'Boutiques'), (2, 90, 'Groupes de boutique'), (2, 91, 'URLs de boutique');
+(2, 87,'Accueil'), (2, 88, 'Boutiques'), (2, 89, 'Groupes de boutique'), (2, 90, 'URLs de boutique');
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (3, 1, 'Catálogo'),(3, 2, 'Clientes'),(3, 3, 'Pedidos'),(3, 4, 'Pago'),(3, 5, 'Transporte'),
@@ -873,7 +874,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (3, 55, 'Albaranes de entrega'),(3, 56, 'SEO & URLs'),(3, 57, 'CMS'),(3, 58, 'Mapeo de la imagen'),(3, 59, 'Mensajes del cliente'),(3, 60, 'Rastreo'),
 (3, 61, 'Motores de búsqueda'),(3, 62, 'Referido'),(3, 63, 'Grupos'),(3, 64, 'Generadores'),(3, 65, 'Carritos'),(3, 66, 'Etiquetas'),(3, 67, 'Búsqueda'),(3, 68, 'Adjuntos'),
 (3, 69, 'Informaciones'),(3, 70, 'Rendimiento'),(3, 72, 'Web service'),(3, 71, 'Servicio al cliente'),(3, 73, 'Movimiento de Stock'), (3, 82, 'Tiendas'),(3, 83, 'Temas'),(3, 84, 'Geolocalización'),(3, 85, 'Reglas de Impuestos'),(3, 86, 'Log'),
-(3, 87,'Home'),(3, 88, 'Mejorar'), (3, 89, 'Shops'), (3, 90, 'Group Shops'), (3, 91, 'Shop Urls');
+(3, 87,'Home'), (3, 88, 'Shops'), (3, 89, 'Group Shops'), (3, 90, 'Shop Urls');
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 1, 'Katalog'),(4, 2, 'Kunden'),(4, 3, 'Bestellungen'),(4, 4, 'Zahlung'),
@@ -888,7 +889,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 61, 'Suchmaschinen'),(4, 62, 'Referrer'),(4, 63, 'Gruppen'),(4, 64, 'Generatoren'),(4, 65, 'Warenkörbe'),(4, 66, 'Tags'),(4, 67, 'Suche'),
 (4, 68, 'Anhänge'),(4, 69, 'Konfigurationsinformationen'),(4, 70, 'Leistung'),(4, 71, 'Kundenservice'),(4, 72, 'Webservice'),(4, 73, 'Lagerbewegungen'),
 (4, 80, 'Module und Themenkatalog'),(4, 81, 'Mein Konto'),(4, 82, 'Shops'),(4, 83, 'Themen'),(4, 84, 'Geotargeting'),(4, 85, 'Steuerregeln'),(4, 86, 'Log'),
-(4, 87,'Home'),(4, 88, 'Upgrade'), (4, 89, 'Shops'), (4, 90, 'Group Shops'), (4, 91, 'Shop Urls');
+(4, 87,'Home'), (4, 88, 'Shops'), (4, 89, 'Group Shops'), (4, 90, 'Shop Urls');
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (5, 1, 'Catalogo'),(5, 2, 'Clienti'),(5, 3, 'Ordini'),(5, 4, 'Pagamento'),
@@ -903,7 +904,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (5, 61, 'Motori di ricerca'),(5, 62, 'Referenti'),(5, 63, 'Gruppi'),(5, 64, 'Generatori'),(5, 65, 'Carrelli shopping'),(5, 66, 'Tag'),(5, 67, 'Cerca'),
 (5, 68, 'Allegati'),(5, 69, 'Informazioni di configurazione'),(5, 70, 'Performance'),(5, 71, 'Servizio clienti'),(5, 72, 'Webservice'),(5, 73, 'Movimenti magazzino'),
 (5, 80, 'Moduli & Temi catalogo'),(5, 81, 'Il mio Account'),(5, 82, 'Negozi'),(5, 83, 'Temi'),(5, 84, 'Geolocalizzazione'),(5, 85, 'Regimi fiscali'),(5, 86, 'Log'),
-(5, 87,'Home'),(5, 88, 'Aggiornamento'), (5, 89, 'Shops'), (5, 90, 'Group Shops'), (5, 91, 'Shop Urls');
+(5, 87,'Home'), (5, 88, 'Shops'), (5, 89, 'Group Shops'), (5, 90, 'Shop Urls');
 
 INSERT IGNORE INTO `PREFIX_tab_lang` (`id_tab`, `id_lang`, `name`)
     (SELECT `id_tab`, id_lang, (SELECT tl.`name`
diff --git a/install-dev/sql/upgrade/1.4.4.0.sql b/install-dev/sql/upgrade/1.4.4.0.sql
index 562c2f815..1c632dd83 100644
--- a/install-dev/sql/upgrade/1.4.4.0.sql
+++ b/install-dev/sql/upgrade/1.4.4.0.sql
@@ -75,7 +75,5 @@ CREATE TABLE IF NOT EXISTS `PREFIX_compare_product` (
 
 DELETE FROM `PREFIX_configuration` WHERE name = 'PS_LAYERED_NAVIGATION_CHECKBOXES' LIMIT 1;
 
-/* PHP:add_new_tab(AdminUpgrade, en:Upgrade|fr:Mise à jour,  9); */;
-
 /* PHP:alter_productcomments_guest_index(); */;
 
diff --git a/install-dev/sql/upgrade/1.4.5.0.sql b/install-dev/sql/upgrade/1.4.5.0.sql
index 3d563c9dc..e24e13b6a 100644
--- a/install-dev/sql/upgrade/1.4.5.0.sql
+++ b/install-dev/sql/upgrade/1.4.5.0.sql
@@ -20,10 +20,12 @@ UPDATE `PREFIX_order_detail` SET `product_price` = `product_price` /( 1-(`group_
 DELETE FROM `PREFIX_configuration` WHERE name IN ('PS_LAYERED_BITLY_USERNAME', 'PS_LAYERED_BITLY_API_KEY', 'PS_LAYERED_SHARE') LIMIT 3;
 
 INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edit`) VALUES
-('attributeGroupForm', 'Add fileds to the form "attribute group"', 'Add fileds to the form "attribute group"', 0, 0),
+('attributeGroupForm', 'Add fields to the form "attribute group"', 'Add fields to the form "attribute group"', 0, 0),
 ('afterSaveAttributeGroup', 'On saving attribute group', 'On saving attribute group', 0, 0),
 ('afterDeleteAttributeGroup', 'On deleting attribute group', 'On deleting "attribute group', 0, 0),
 ('featureForm', 'Add fileds to the form "feature"', 'Add fileds to the form "feature"', 0, 0),
 ('afterSaveFeature', 'On saving attribute feature', 'On saving attribute feature', 0, 0),
-('afterDeleteFeature', 'On deleting attribute feature', 'On deleting attribute feature', 0, 0);
+('afterDeleteFeature', 'On deleting attribute feature', 'On deleting attribute feature', 0, 0),
+('afterSaveProduct', 'On saving products', 'On saving products', 0, 0),
+('productListAssign', 'Assign product list to a category', 'Assign product list to a category', 0, 0);
 
diff --git a/modules/autoupgrade/AdminSelfTab.php b/modules/autoupgrade/AdminSelfTab.php
index 59dc2ba50..44549e354 100644
--- a/modules/autoupgrade/AdminSelfTab.php
+++ b/modules/autoupgrade/AdminSelfTab.php
@@ -415,14 +415,17 @@ abstract class AdminSelfTab
 	 */
 	protected function l($string, $class = 'AdminTab', $addslashes = FALSE, $htmlentities = TRUE)
 	{
+		global $_LANGADM;
+		if(empty($_LANGADM))
+			$_LANGADM = array();
 		// if the class is extended by a module, use modules/[module_name]/xx.php lang file
 		$currentClass = get_class($this);
+		if (class_exists('Module') AND method_exists('Module','getModuleNameFromClass'))
 		if (Module::getModuleNameFromClass($currentClass))
 		{
 			$string = str_replace('\'', '\\\'', $string);
 			return Module::findTranslation(Module::$classInModule[$currentClass], $string, $currentClass);
 		}
-		global $_LANGADM;
 
 		if ($class == __CLASS__)
 				$class = 'AdminTab';
@@ -1294,7 +1297,15 @@ abstract class AdminSelfTab
 				  </script>
 			<div class="warn">';
 			if (!is_array($warn))
-				$str_output .= '<img src="../img/admin/warn2.png" />'.$warn;
+			{
+				if (file_exists(__PS_BASE_URI__.'img/admin/warn2.png'))
+					$str_output .= '<img src="'.__PS_BASE_URI__.'img/admin/warn2.png" />';
+			else
+					$str_output .= '<img src="'.__PS_BASE_URI__.'img/admin/warning.gif" />';
+
+
+				$str_output .= $warn;
+			}
 			else
 			{	$str_output .= '<span style="float:right"><a id="hideWarn" href=""><img alt="X" src="../img/admin/close.png" /></a></span><img src="../img/admin/warn2.png" />'.
 				(count($warn) > 1 ? $this->l('There are') : $this->l('There is')).' '.count($warn).' '.(count($warn) > 1 ? $this->l('warnings') : $this->l('warning'))
@@ -2141,5 +2152,112 @@ abstract class AdminSelfTab
 			<a href="index.php?tab=AdminMeta&token='.Tools14::getAdminTokenLite('AdminMeta').'#SEO%20%26%20URLs">'.
 			$this->l('Click here if you want to modify the main shop domain name').'</a>');
 	}
+	/*
+	* from 1.4 AdminPreferences
+	*/
+	protected function _postConfig($fields)
+	{
+		global $currentIndex, $smarty;
+
+		$languages = Language::getLanguages(false);
+		if (function_exists('Tools','clearCache'))
+			Tools::clearCache($smarty);
+
+		/* Check required fields */
+		foreach ($fields AS $field => $values)
+			if (isset($values['required']) AND $values['required'])
+				if (isset($values['type']) AND $values['type'] == 'textLang')
+				{
+					foreach ($languages as $language)
+						if (($value = Tools::getValue($field.'_'.$language['id_lang'])) == false AND (string)$value != '0')
+							$this->_errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is required.');
+}
+				elseif (($value = Tools::getValue($field)) == false AND (string)$value != '0')
+					$this->_errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is required.');
+
+		/* Check fields validity */
+		foreach ($fields AS $field => $values)
+			if (isset($values['type']) AND $values['type'] == 'textLang')
+			{
+				foreach ($languages as $language)
+					if (Tools::getValue($field.'_'.$language['id_lang']) AND isset($values['validation']))
+						if (!Validate::$values['validation'](Tools::getValue($field.'_'.$language['id_lang'])))
+							$this->_errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is invalid.');
+			}
+			elseif (Tools::getValue($field) AND isset($values['validation']))
+				if (!Validate::$values['validation'](Tools::getValue($field)))
+					$this->_errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is invalid.');
+
+		/* Default value if null */
+		foreach ($fields AS $field => $values)
+			if (!Tools::getValue($field) AND isset($values['default']))
+				$_POST[$field] = $values['default'];
+
+		/* Save process */
+		if (!sizeof($this->_errors))
+		{
+			if (Tools::isSubmit('submitAppearanceconfiguration'))
+			{
+				if (isset($_FILES['PS_LOGO']['tmp_name']) AND $_FILES['PS_LOGO']['tmp_name'])
+				{
+					if ($error = checkImage($_FILES['PS_LOGO'], 300000))
+						$this->_errors[] = $error;
+					if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') OR !move_uploaded_file($_FILES['PS_LOGO']['tmp_name'], $tmpName))
+						return false;
+					elseif (!@imageResize($tmpName, _PS_IMG_DIR_.'logo.jpg'))
+						$this->_errors[] = 'an error occurred during logo copy';
+					unlink($tmpName);
+				}
+				if (isset($_FILES['PS_LOGO_MAIL']['tmp_name']) AND $_FILES['PS_LOGO_MAIL']['tmp_name'])
+				{
+					if ($error = checkImage($_FILES['PS_LOGO_MAIL'], 300000))
+						$this->_errors[] = $error;
+					if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS_MAIL') OR !move_uploaded_file($_FILES['PS_LOGO_MAIL']['tmp_name'], $tmpName))
+						return false;
+					elseif (!@imageResize($tmpName, _PS_IMG_DIR_.'logo_mail.jpg'))
+						$this->_errors[] = 'an error occurred during logo copy';
+					unlink($tmpName);
+				}
+				if (isset($_FILES['PS_LOGO_INVOICE']['tmp_name']) AND $_FILES['PS_LOGO_INVOICE']['tmp_name'])
+				{
+					if ($error = checkImage($_FILES['PS_LOGO_INVOICE'], 300000))
+						$this->_errors[] = $error;
+					if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS_INVOICE') OR !move_uploaded_file($_FILES['PS_LOGO_INVOICE']['tmp_name'], $tmpName))
+						return false;
+					elseif (!@imageResize($tmpName, _PS_IMG_DIR_.'logo_invoice.jpg'))
+						$this->_errors[] = 'an error occurred during logo copy';
+					unlink($tmpName);
+				}
+				if (isset($_FILES['PS_STORES_ICON']['tmp_name']) AND $_FILES['PS_STORES_ICON']['tmp_name'])
+				{
+					if ($error = checkImage($_FILES['PS_STORES_ICON'], 300000))
+						$this->_errors[] = $error;
+					if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS_STORES_ICON') OR !move_uploaded_file($_FILES['PS_STORES_ICON']['tmp_name'], $tmpName))
+						return false;
+					elseif (!@imageResize($tmpName, _PS_IMG_DIR_.'logo_stores.gif'))
+						$this->_errors[] = 'an error occurred during logo copy';
+					unlink($tmpName);
+				}
+				$this->uploadIco('PS_FAVICON', _PS_IMG_DIR_.'favicon.ico');
+			}
+
+			/* Update settings in database */
+			if (!sizeof($this->_errors))
+			{
+				foreach ($fields AS $field => $values)
+				{
+					unset($val);
+					if (isset($values['type']) AND $values['type'] == 'textLang')
+						foreach ($languages as $language)
+							$val[$language['id_lang']] = isset($values['cast']) ? $values['cast'](Tools::getValue($field.'_'.$language['id_lang'])) : Tools::getValue($field.'_'.$language['id_lang']);
+					else
+						$val = isset($values['cast']) ? $values['cast'](Tools::getValue($field)) : Tools::getValue($field);
+
+					Configuration::updateValue($field, $val);
+				}
+				Tools::redirectAdmin($currentIndex.'&conf=6'.'&token='.$this->token);
+			}
+		}
+	}
 }
 
diff --git a/modules/autoupgrade/AdminSelfUpgrade.gif b/modules/autoupgrade/AdminSelfUpgrade.gif
new file mode 100644
index 000000000..981356908
Binary files /dev/null and b/modules/autoupgrade/AdminSelfUpgrade.gif differ
diff --git a/modules/autoupgrade/AdminSelfUpgrade.php b/modules/autoupgrade/AdminSelfUpgrade.php
index 448783608..fc32ef3ea 100644
--- a/modules/autoupgrade/AdminSelfUpgrade.php
+++ b/modules/autoupgrade/AdminSelfUpgrade.php
@@ -31,6 +31,9 @@ if(!defined('_PS_USE_SQL_SLAVE_'))
 
 if(empty($_POST['action']) OR !in_array($_POST['action'],array('upgradeDb')))
 {
+	if(!defined('_PS_CACHE_ENABLED_'))
+		define('_PS_CACHE_ENABLED_',false);
+
 	if(!defined('PS_ORDER_PROCESS_STANDARD'))
 		define('PS_ORDER_PROCESS_STANDARD',true);
 	if(!defined('PS_ORDER_PROCESS_OPC'))
@@ -40,24 +43,22 @@ if(empty($_POST['action']) OR !in_array($_POST['action'],array('upgradeDb')))
 }
 	require_once(dirname(__FILE__).'/AdminSelfTab.php');
 	require_once(dirname(__FILE__).'/SelfModule.php');
-	if(file_exists(_PS_ROOT_DIR_.'/classes/Upgrader.php'))
-	{
+
+// Add Upgrader class 
+	if(!version_compare(_PS_VERSION_,'1.4.5.0','<') AND file_exists(_PS_ROOT_DIR_.'/classes/Upgrader.php'))
 		require_once(_PS_ROOT_DIR_.'/classes/Upgrader.php');
-	}
 	else
 		require_once(dirname(__FILE__).'/Upgrader.php');
 
 	if(!class_exists('Upgrader',false))
 	{
 		if(file_exists(_PS_ROOT_DIR_.'/override/classes/Upgrader.php'))
-		{
 			require_once(_PS_ROOT_DIR_.'/override/classes/Upgrader.php');
-		}
 		else
-		{
 			eval('class Upgrader extends UpgraderCore{}');
 		}
-	}
+
+
 
 require_once(dirname(__FILE__).'/Tools14.php');
 if(!class_exists('Tools',false))
@@ -68,6 +69,9 @@ class AdminSelfUpgrade extends AdminSelfTab
 	public $nextResponseType = 'json'; // json, xml
 	public $next = 'N/A';
 	
+	public $upgrader = null;
+	public $standalone = true;
+	
 	/**
 	 * set to false if the current step is a loop
 	 *
@@ -111,8 +115,8 @@ class AdminSelfUpgrade extends AdminSelfTab
 	public $rootWritable = false;
 	public $svnDir = 'svn';
 	public $destDownloadFilename = 'prestashop.zip';
-	public $toUpgradeFileList = array();
-	public $backupFileList = array();
+	public $toUpgradeFileList = 'filesToUpgrade.list';
+	public $toBackupFileList = 'filesToBackup.list';
 	public $sampleFileList = array();
 	private $backupIgnoreFiles = array();
 	private $backupIgnoreAbsoluteFiles = array();
@@ -165,7 +169,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 		global $cookie;
 		$id_employee = $cookie->id_employee;
 
-		$cookiePath = __PS_BASE_URI__.str_replace($this->prodRootDir,'',trim($this->adminDir,'/'));
+		$cookiePath = __PS_BASE_URI__.str_replace($this->prodRootDir,'',trim($this->adminDir,DIRECTORY_SEPARATOR));
 		setcookie('id_employee', $id_employee, time()+3600, $cookiePath);
 		setcookie('id_tab', $this->id, time()+3600, $cookiePath);
 		setcookie('autoupgrade', $this->encrypt($id_employee), time()+3600, $cookiePath);
@@ -221,7 +225,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 	private function _setFields()
 	{
 		$this->_fieldsAutoUpgrade['PS_AUTOUP_DONT_SAVE_IMAGES'] = array(
-			'title' => $this->l('Don\'t save images'), 'cast' => 'intval', 'validation' => 'isBool',
+			'title' => $this->l('Also save images'), 'cast' => 'intval', 'validation' => 'isBool',
 			'type' => 'bool', 'desc'=>$this->l('You can exclude the image directory from backup if you already saved it by another method (not recommended)'),
 		);
 
@@ -259,6 +263,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 	{
 		$allowed = (ConfigurationTest::test_fopen() && $this->rootWritable);
 		$allowed &= !Configuration::get('PS_SHOP_ENABLE');
+		$allowed &= (Configuration::get('PS_AUTOUP_KEEP_TRAD') !== false);
 
 		return $allowed;
 	}
@@ -272,7 +277,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 		$allowed = (ConfigurationTest::test_fopen() && $this->rootWritable);
 
 		if (!defined('_PS_MODE_DEV_') OR !_PS_MODE_DEV_)
-			$allowed &= $this->upgrader->autoupgrade;
+			$allowed &= $this->upgrader->autoupgrade_module;
 
 		return $allowed;
 	}
@@ -289,8 +294,11 @@ class AdminSelfUpgrade extends AdminSelfTab
 		$this->prodRootDir = _PS_ROOT_DIR_;
 		$this->adminDir = _PS_ADMIN_DIR_;
 
+		// from $_POST or $_GET
+		$this->action = empty($_REQUEST['action'])?null:$_REQUEST['action'];
+		$this->currentParams = empty($_REQUEST['params'])?null:$_REQUEST['params'];
 		// test writable recursively
-		if(version_compare(_PS_VERSION_,'1.4.4.0','<'))
+		if(version_compare(_PS_VERSION_,'1.4.5.0','<'))
 		{
 			require_once('ConfigurationTest.php');
 			if(!class_exists('ConfigurationTest', false) AND class_exists('ConfigurationTestCore'))
@@ -299,25 +307,28 @@ class AdminSelfUpgrade extends AdminSelfTab
 		if (ConfigurationTest::test_dir($this->prodRootDir,true))
 			$this->rootWritable = true;
 
+		if (!in_array($this->action,array('upgradeFile', 'upgradeDb', 'upgradeComplete','rollback','restoreFiles','restoreDb')))
+		{
 		// checkPSVersion will be not 
-		$this->upgrader = new Upgrader(true);
+			$this->upgrader = new Upgrader();
 		$this->upgrader->checkPSVersion();
-		if (version_compare(_PS_VERSION_,'1.4.4.0','<') OR $this->upgrader->need_standalone)
+			$this->currentParams['install_version'] = $this->upgrader->version_num;
+
+			if ($this->upgrader->autoupgrade_module)
 			$this->standalone = true;
 		else
 			$this->standalone = false;
+$this->standalone = true;
+		}
 		// If you have defined this somewhere, you know what you do
 		if (defined('_PS_ALLOW_UPGRADE_UNSTABLE_') AND _PS_ALLOW_UPGRADE_UNSTABLE_ AND function_exists('svn_checkout'))
 		{
-			if(version_compare(_PS_VERSION_,'1.4.4.0','<') OR class_exists('Configuration',false))
+			if(version_compare(_PS_VERSION_,'1.4.5.0','<') OR class_exists('Configuration',false))
 				$this->useSvn = Configuration::get('PS_AUTOUP_USE_SVN');
 		}
 		else
 			$this->useSvn = false;
 		
-		// from $_POST or $_GET
-		$this->action = empty($_REQUEST['action'])?null:$_REQUEST['action'];
-		$this->currentParams = empty($_REQUEST['params'])?null:$_REQUEST['params'];
 
 		// If not exists in this sessions, "create"
 		// session handling : from current to next params
@@ -327,6 +338,18 @@ class AdminSelfUpgrade extends AdminSelfTab
 		if (isset($this->currentParams['filesToUpgrade']))
 			$this->nextParams['filesToUpgrade'] = $this->currentParams['filesToUpgrade'];
 
+		// set autoupgradePath, to be used in backupFiles and backupDb config values
+		$this->autoupgradePath = $this->adminDir.DIRECTORY_SEPARATOR.$this->autoupgradeDir;
+
+		if (!file_exists($this->autoupgradePath))
+			if (!@mkdir($this->autoupgradePath,0777))
+				$this->_errors[] = Tools::displayError(sprintf($this->l('unable to create directory %s'),$this->autoupgradePath));
+
+		$latest = $this->autoupgradePath.DIRECTORY_SEPARATOR.'latest';
+		if (!file_exists($latest))
+			if (!@mkdir($latest,0777))
+				$this->_errors[] = Tools::displayError(sprintf($this->l('unable to create directory %s'),$latest));
+
 		if (class_exists('Configuration',false))
 		{
 			$time = time();
@@ -351,26 +374,16 @@ class AdminSelfUpgrade extends AdminSelfTab
 			// backupFilesFilename should never etc.
 			$this->backupFilesFilename = $this->currentParams['backupFilesFilename'];
 		}
-		$this->autoupgradePath = $this->adminDir.DIRECTORY_SEPARATOR.$this->autoupgradeDir;
-
-		if (!file_exists($this->autoupgradePath))
-			if (!@mkdir($this->autoupgradePath,0777))
-				$this->_errors[] = Tools::displayError(sprintf($this->l('unable to create directory %s'),$this->autoupgradePath));
-
-		$latest = $this->autoupgradePath.DIRECTORY_SEPARATOR.'latest';
-		if (!file_exists($latest))
-			if (!@mkdir($latest,0777))
-				$this->_errors[] = Tools::displayError(sprintf($this->l('unable to create directory %s'),$latest));
 
 		$this->latestRootDir = $latest.DIRECTORY_SEPARATOR.'prestashop';
 		$this->adminDir = str_replace($this->prodRootDir,'',$this->adminDir);
-		// @TODO future option
+		// @TODO future option "install in test dir"
 		//	$this->testRootDir = $this->autoupgradePath.DIRECTORY_SEPARATOR.'test';
 
 		/* option */
 		if (class_exists('Configuration',false))
 		{
-			$this->dontBackupImages = Configuration::get('PS_AUTOUP_DONT_SAVE_IMAGES');
+			$this->dontBackupImages = !Configuration::get('PS_AUTOUP_DONT_SAVE_IMAGES');
 			$this->keepDefaultTheme = Configuration::get('PS_AUTOUP_KEEP_DEFAULT_THEME');
 			$this->keepTrad = Configuration::get('PS_AUTOUP_KEEP_TRAD');
 			$this->manualMode = Configuration::get('PS_AUTOUP_MANUAL_MODE');
@@ -382,7 +395,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 			$this->keepDefaultTheme = $this->currentParams['keepDefaultTheme'];
 			$this->keepTrad = $this->currentParams['keepTrad'];
 			$this->manualMode = $this->currentParams['manualMode'];
-			$this->desactivateCustomModule = $this->current['desactivateCustomModule'];
+			$this->desactivateCustomModule = $this->currentParams['desactivateCustomModule'];
 		}
 		// We can add any file or directory in the exclude dir : theses files will be not removed or overwritten	
 		// @TODO cache should be ignored recursively, but we have to reconstruct it after upgrade
@@ -398,6 +411,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 		$this->excludeFilesFromUpgrade[] = '.svn';
 		$this->excludeFilesFromUpgrade[] = 'install';
 		$this->excludeFilesFromUpgrade[] = 'settings.inc.php';
+		// this will exclude autoupgrade dir from admin, and autoupgrade from modules
 		$this->excludeFilesFromUpgrade[] = 'autoupgrade';
 		$this->backupIgnoreFiles[] = '.';
 		$this->backupIgnoreFiles[] = '..';
@@ -493,7 +507,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 	}
 
 	public function ajaxProcessUnzip(){
-		if(version_compare(_PS_VERSION_,'1.4.4.0','<')
+		if(version_compare(_PS_VERSION_,'1.4.5.0','<')
 			AND !class_exists('Tools',false)
 		)
 			require_once('Tools.php');
@@ -556,9 +570,12 @@ class AdminSelfUpgrade extends AdminSelfTab
 
 	public function _listBackupFiles($dir)
 	{
+		static $list = array();
 		$allFiles = scandir($dir);
 		foreach ($allFiles as $file)
 		{
+			if ($file[0] != '.')
+			{
 			$fullPath = $dir.DIRECTORY_SEPARATOR.$file;
 			
 			if (!$this->_skipFile($file, $fullPath,'backup'))
@@ -566,16 +583,18 @@ class AdminSelfUpgrade extends AdminSelfTab
 					if (is_dir($fullPath))
 						$this->_listBackupFiles($fullPath);
 					else
-						$this->backupFileList[] = $fullPath;					
+						$list[] = $fullPath;					
 			}
 			else
-					$this->backupIgnoreFiles[] = $fullPath;
-
+					$list[] = $fullPath;
 		}
 	}
+		file_put_contents($this->autoupgradePath.DIRECTORY_SEPARATOR.$this->toBackupFileList,serialize($list));
+	}
 
 	public function _listFilesToUpgrade($dir)
 	{
+		static $list = array();
 		$allFiles = scandir($dir);
 		foreach ($allFiles as $file)
 		{
@@ -583,20 +602,15 @@ class AdminSelfUpgrade extends AdminSelfTab
 			
 			if (!$this->_skipFile($file, $fullPath, "upgrade"))
 			{
+				$list[] = $fullPath;
+				// if is_dir, we will create it :)
 				if (is_dir($fullPath))
-				{
-						// if is_dir, we will create it :)e it :)
-						$this->toUpgradeFileList[] = $fullPath;
 							if (strpos($dir.DIRECTORY_SEPARATOR.$file, 'install') === false)
-							{
 								$this->_listFilesToUpgrade($fullPath);
 							}
 				}
-				else
-						$this->toUpgradeFileList[] = $fullPath;
-			}
-		}
 
+		file_put_contents($this->autoupgradePath.DIRECTORY_SEPARATOR.$this->toUpgradeFileList,serialize($list));
 		$this->nextParams['filesToUpgrade'] = $this->toUpgradeFileList;
 	}
 
@@ -615,9 +629,9 @@ class AdminSelfUpgrade extends AdminSelfTab
 		// @TODO :
 		// foreach files in latest, copy
 		$this->next = 'upgradeFiles';
-		if (!is_array($this->nextParams['filesToUpgrade']))
+		$filesToUpgrade = @unserialize(file_get_contents($this->nextParams['filesToUpgrade']));
+		if (!is_array($filesToUpgrade))
 		{
-			error($this->nextParams);
 			$this->next = 'error';
 			$this->nextDesc = $this->l('filesToUpgrade is not an array');
 			$this->nextQuickInfo[] = $this->l('filesToUpgrade is not an array');
@@ -627,29 +641,31 @@ class AdminSelfUpgrade extends AdminSelfTab
 		// @TODO : does not upgrade files in modules, translations if they have not a correct md5 (or crc32, or whatever) from previous version
 		for ($i=0;$i<self::$loopUpgradeFiles;$i++)
 		{
-			if (sizeof($this->nextParams['filesToUpgrade'])<=0)
+			if (sizeof($filesToUpgrade)<=0)
 			{
 				$this->next = 'upgradeDb';
+				unlink($this->nextParams['filesToUpgrade']);
 				$this->nextDesc = $this->l('All files upgraded. Now upgrading database');
 				$this->nextResponseType = 'xml';
 				break;
 			}
 
-			//$file = array_shift($this->nextParams['filesToUpgrade']);
-			$file = array_shift($this->nextParams['filesToUpgrade']);
+			$file = array_shift($filesToUpgrade);
 			if (!$this->upgradeThisFile($file))
 			{
 				// put the file back to the begin of the list
-				$totalFiles = array_unshift($this->nextParams['filesToUpgrade'],$file);
+				$totalFiles = array_unshift($filesToUpgrade,$file);
 				$this->next = 'error';
 				$this->nextQuickInfo[] = sprintf($this->l('error when trying to upgrade %s'),$file);
 				break;
 			}
 			else{
+				$this->nextQuickInfo[] = sprintf($this->l('copied %1$s. %2$s files left to upgrade.'),$file, sizeof($filesToUpgrade));
 				// @TODO : maybe put several files at the same times ?
-				$this->nextDesc = sprintf($this->l('%2$s files left to upgrade.'),$file,sizeof($this->nextParams['filesToUpgrade']));
+				$this->nextDesc = sprintf($this->l('%2$s files left to upgrade.'),$file,sizeof($filesToUpgrade));
 			}
 		}
+		file_put_contents($this->nextParams['filesToUpgrade'],serialize($filesToUpgrade));
 	}
 
 	/**
@@ -692,10 +708,14 @@ class AdminSelfUpgrade extends AdminSelfTab
 		///////////////////////
 		// Copy from model.php
 		///////////////////////
+		if (!is_object($this->upgrader))
+			$this->upgrader = new Upgrader();
+
 		$upgrader = $this->upgrader;
+
 		$upgrader->checkPSVersion();
 
-		define('INSTALL_VERSION', $upgrader->version_num);
+		define('INSTALL_VERSION', $this->currentParams['install_version']);
 		// now the install dir to use is in a subdirectory of the admin dir
 		define('INSTALL_PATH', realpath($this->latestRootDir.DIRECTORY_SEPARATOR.'install'));
 
@@ -733,14 +753,12 @@ class AdminSelfUpgrade extends AdminSelfTab
 		// 2) confirm config is correct (r/w rights)
 		//	install/model.php?method=checkConfig&firsttime=0
 		// later
-
 		// 3) save current activated modules in nextParams, or don't desactivate them ?
 		// @TODO
 		// 4) upgrade
 		//	install/model.php?_=1309193641470&method=doUpgrade&customModule=desactivate
 		if (!empty($this->currentParams['desactivateCustomModule']))
 			$_GET['customModule'] = 'desactivate';
-
 		if (!$this->_modelDoUpgrade())
 		{
 			$this->next = 'error';
@@ -775,13 +793,14 @@ class AdminSelfUpgrade extends AdminSelfTab
 
 			if (is_dir($file))
 			{
+				// if $dest is not a directory (that can happen), just remove that file
+				if (!is_dir($dest) AND file_exists($dest))
+					unlink($dest);
+
 				if (!file_exists($dest))
 				{
 					if (@mkdir($dest))
-					{
-						$this->nextQuickInfo[] = sprintf($this->l('created dir %2$s. %3$s files left to upgrade.'),$file, $dest, sizeof($this->nextParams['filesToUpgrade']));
 						return true;
-					}
 					else
 					{
 						$this->next = 'error';
@@ -791,18 +810,13 @@ class AdminSelfUpgrade extends AdminSelfTab
 					}
 				}
 				else
-				{
 					// directory already exists
 					return true;
 				}
-			}
 			else
 			{
 				if (copy($file,$dest))
-				{
-					$this->nextQuickInfo[] = sprintf($this->l('copied %1$s in %2$s. %3$s files left to upgrade.'),$file, $dest, sizeof($this->nextParams['filesToUpgrade']));
 					return true;
-				}
 				else
 				{
 					$this->next = 'error';
@@ -824,7 +838,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 		{
 			$this->next = 'restoreFiles';
 			$this->status = 'ok';
-			$this->nextDesc = $this->l('Files restored, now restoring database.');
+			$this->nextDesc = $this->l('Restoring files...');
 		}
 		else
 		{
@@ -832,7 +846,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 			{
 				$this->next = 'restoreDb';
 				$this->status = 'ok';
-				$this->nextDesc = $this->l('Database restored');
+				$this->nextDesc = $this->l('restoring Database ...');
 			}
 			else
 			{
@@ -841,6 +855,9 @@ class AdminSelfUpgrade extends AdminSelfTab
 				// all theses cases are handled by the method ajaxRequestRollback()
 				$this->next = ''; // next is empty : nothing next :)
 				$this->status = 'ok';
+				if (isset($this->currentParams['firstTime']))
+						$this->nextDesc = $this->l('Nothing has to be restored');
+					else
 				$this->nextDesc = $this->l('All your site is restored... ');
 			}
 		}
@@ -866,19 +883,18 @@ class AdminSelfUpgrade extends AdminSelfTab
 				$filepath = $this->backupFilesFilename;
 				$destExtract = $this->prodRootDir;
 
+
 				if (self::ZipExtract($filepath, $destExtract))
 				{
-					// once it's restored, delete the file !
-					unlink($this->backupFilesFilename);
-					Configuration::updateValue('UPGRADER_BACKUPFILES_FILENAME', '');
-					if (!empty($this->backupDbFilename))
+					// once it's restored, do not delete the archive file. This has to be done manually
+					if (!empty($this->backupDbFilename) AND file_exists($this->backupDbFilename) )
 					{
 						$this->nextDesc = $this->l('Files restored. No database backup found. Restoration done.');
-						$this->next = '';
+						$this->next = 'rollback';
 					}
 					else
 					{
-						$this->nextDesc = $this->l('Files restored.');
+						$this->nextDesc = $this->l('Files restored. No database backup found. Restoration done.');
 						$this->next = 'rollback';
 					}
 					return true;
@@ -906,6 +922,8 @@ class AdminSelfUpgrade extends AdminSelfTab
 	*/
 	public function ajaxProcessRestoreDb()
 	{
+		$this->_loadDbRelatedClasses();
+
 		$exts = explode('.', $this->backupDbFilename);
 		$fileext = $exts[count($exts)-1];
 		$requests = array();
@@ -947,12 +965,12 @@ class AdminSelfUpgrade extends AdminSelfTab
 		// This way we avoid extra blank lines
 		// option s (PCRE_DOTALL) added
 		// @TODO need to check if a ";" in description could block that (I suppose it can at the end of a line)
-		preg_match_all('/.*;[\n]\+/s', $content, $requests);
+		preg_match_all('/(.*;)[\n\r]+/Usm', $content, $requests);
 		/* @TODO maybe improve regex pattern ... */
 		$db = Db::getInstance();	
-		if (count($requests)>0)
+		if (count($requests[0])>0)
 		{
-			foreach ($requests as $request)
+			foreach ($requests[1] as $request)
 				if (!empty($request))
 					if (!$db->Execute($request))
 						$this->nextQuickInfo[] = $db->getMsgError();
@@ -968,8 +986,9 @@ class AdminSelfUpgrade extends AdminSelfTab
 		$this->nextDesc = 'Database restore done.';
 	}
 
-	public function ajaxProcessBackupDb()
+	private function _loadDbRelatedClasses()
 	{
+		// Manual inclusion of all classes used
 		if(!class_exists('ObjectModel',false))
 		{
 			require_once(_PS_ROOT_DIR_.'/classes/ObjectModel.php');
@@ -983,12 +1002,6 @@ class AdminSelfUpgrade extends AdminSelfTab
 			if(!class_exists('Language',false))
 				eval('Class Language extends LanguageCore{}');
 		}
-		if(!class_exists('Validate',false))
-		{
-			require_once(_PS_ROOT_DIR_.'/classes/Validate.php');
-			if(!class_exists('Validate',false))
-				eval('Class Validate extends ValidateCore{}');
-		}
 		if(!class_exists('Db',false))
 		{
 			require_once(_PS_ROOT_DIR_.'/classes/Db.php');
@@ -1001,6 +1014,13 @@ class AdminSelfUpgrade extends AdminSelfTab
 			if(!class_exists('MySQL',false))
 				eval('Class MySQL extends MySQLCore{}');
 		}
+		
+		if(!class_exists('Validate',false))
+		{
+			require_once(_PS_ROOT_DIR_.'/classes/Validate.php');
+			if(!class_exists('Validate',false))
+				eval('Class Validate extends ValidateCore{}');
+		}
 		if(!class_exists('Configuration',false))
 		{
 			require_once(_PS_ROOT_DIR_.'/classes/Configuration.php');
@@ -1021,6 +1041,11 @@ class AdminSelfUpgrade extends AdminSelfTab
 			define('_PS_MAGIC_QUOTES_GPC_', get_magic_quotes_gpc());
 		if(!defined('_PS_MYSQL_REAL_ESCAPE_STRING_'))
 			define('_PS_MYSQL_REAL_ESCAPE_STRING_', function_exists('mysql_real_escape_string'));
+		Configuration::loadConfiguration();
+	}
+	public function ajaxProcessBackupDb()
+	{
+		$this->_loadDbRelatedClasses();
 
 		$backup = new Backup();
 		// for backup db, use autoupgrade directory
@@ -1050,8 +1075,8 @@ class AdminSelfUpgrade extends AdminSelfTab
 		if (!isset($this->nextParams['filesForBackup']))
 		{
 			$list = $this->_listBackupFiles($this->prodRootDir);
-			$this->nextQuickInfo[] = sprintf($this->l('%s Files to backup.'), sizeof($this->backupFileList));
-			$this->nextParams['filesForBackup'] = $this->backupFileList;
+			$this->nextQuickInfo[] = sprintf($this->l('%s Files to backup.'), sizeof($this->toBackupFileList));
+			$this->nextParams['filesForBackup'] = $this->toBackupFileList;
 
 			// delete old backup, create new
 			if (file_exists($this->backupFilesFilename))
@@ -1059,12 +1084,13 @@ class AdminSelfUpgrade extends AdminSelfTab
 
 			$this->nextQuickInfo[]	= sprintf($this->l('backup files initialized in %s'), $this->backupFilesFilename);
 		}
+		$filesToBackup = unserialize(file_get_contents($this->toBackupFileList));
 
 		/////////////////////
 		$this->next = 'backupFiles';
 		// @TODO : display % instead of this
-		$this->nextDesc = sprintf($this->l('Backup files in progress. %s files left'), sizeof($this->nextParams['filesForBackup']));
-		if (is_array($this->nextParams['filesForBackup']))
+		$this->nextDesc = sprintf($this->l('Backup files in progress. %s files left'), sizeof($filesToBackup));
+		if (is_array($filesToBackup))
 		{
 			// @TODO later
 			// 1) calculate crc32 of next file
@@ -1089,7 +1115,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 					// @TODO min(self::$loopBackupFiles, sizeof())
 					for($i=0;$i<self::$loopBackupFiles;$i++)
 					{
-						if (sizeof($this->nextParams['filesForBackup'])<=0)
+						if (sizeof($filesToBackup)<=0)
 						{
 							$this->stepok = true;
 							$this->status = 'ok';
@@ -1099,11 +1125,11 @@ class AdminSelfUpgrade extends AdminSelfTab
 							break;
 						}
 						// filesForBackup already contains all the correct files
-						$file = array_shift($this->nextParams['filesForBackup']);
-						$archiveFilename = str_replace($this->prodRootDir,'',$file);
+						$file = array_shift($filesToBackup);
+						$archiveFilename = ltrim(str_replace($this->prodRootDir,'',$file),DIRECTORY_SEPARATOR);
 						// @TODO : maybe put several files at the same times ?
 						if ($zip->addFile($file,$archiveFilename))
-							$this->nextQuickInfo[] = sprintf($this->l('%1$s added to archive. %2$s left.'),$file, sizeof($this->nextParams['filesForBackup']));
+							$this->nextQuickInfo[] = sprintf($this->l('%1$s added to archive. %2$s left.'),$file, sizeof($filesToBackup));
 						else
 						{
 						// if an error occur, it's more safe to delete the corrupted backup
@@ -1115,6 +1141,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 						}
 					}
 					$zip->close();
+					file_put_contents($this->autoupgradePath.DIRECTORY_SEPARATOR.$this->toBackupFileList,serialize($filesToBackup));
 					return true;
 				}
 				else{
@@ -1157,7 +1184,6 @@ class AdminSelfUpgrade extends AdminSelfTab
 
 	public function ajaxProcessRemoveSamples(){
 		$this->stepDone = false;
-		// @TODO : list exaustive list of files to remove :
 		// all images from img dir exept admin ?
 		// all images like logo, favicon, ?.
 		// all custom image from modules ?
@@ -1306,8 +1332,8 @@ class AdminSelfUpgrade extends AdminSelfTab
 	{
 		if(!$this->standalone)
 		{
-			if (version_compare(_PS_VERSION_,'1.4.4.0','<') AND false)
-				$this->_errors[] = Tools::displayError('This class depends of several files modified in 1.4.4.0 version and should not be used in an older version');
+			if (version_compare(_PS_VERSION_,'1.4.5.0','<') AND false)
+				$this->_errors[] = Tools::displayError('This class depends of several files modified in 1.4.5.0 version and should not be used in an older version');
 		}
 		parent::displayConf();
 		
@@ -1336,7 +1362,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 			}
 		}
 
-		if ($this->apacheModExists('mod_evasive'))
+		if ($this->apacheModExists('evasive'))
 			sleep(1);
 	}
 	/**
@@ -1357,9 +1383,11 @@ class AdminSelfUpgrade extends AdminSelfTab
 	
 			// we need strpos (example can be evasive20
 			foreach($apacheModuleList as $module)
-				if (strpos($name, $module)!==false)
+			{
+				if (strpos($module, $name)!==false)
 					return true;
 		}
+		}
 		else{
 			// If apache_get_modules does not exists,
 			// one solution should be parsing httpd.conf, 
@@ -1377,7 +1405,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 
 	private function _getJsErrorMsgs()
 	{
-		$INSTALL_VERSION = $this->upgrader->version_num;
+		$INSTALL_VERSION = $this->currentParams['install_version'];
 		$ret = '
 var txtError = new Array();
 txtError[0] = "'.$this->l('Required field').'";
@@ -1501,11 +1529,11 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 				$srcExecTime = '../img/admin/warning.gif';
 			echo '<b>'.$this->l('PHP time limit').' : </b>'.'<img src="'.$srcExecTime.'" />'.($max_exec_time == 0?$this->l('disabled'):$max_exec_time.' '.$this->l('seconds')).' <br/><br/>';
 
-			if ($this->rootWritable)
-				$srcRootWritable = '../img/admin/enabled.gif';
+			if (($testConfigDone = Configuration::get('PS_AUTOUP_DONT_SAVE_IMAGES')) !== false)
+				$configurationDone = '../img/admin/enabled.gif';
 			else
-				$srcRootWritable = '../img/admin/disabled.gif';
-			echo '<b>'.$this->l('Root directory').' : </b>'.'<img src="'.$srcRootWritable.'" /> '.($this->rootWritable?$this->l('writable recursively'):$this->l('not writable recursively')).'. <br/><br/>';
+				$configurationDone = '../img/admin/disabled.gif';
+			echo '<b>'.$this->l('Options chosen').' : </b>'.'<img src="'.$configurationDone.'" /> '.($testConfigDone?$this->l('autoupgrade configuration ok'):$this->l('Please configure autoupgrade options')).'<br/><br/>';
 
 			echo '<a class="button" id="scrollToOptions" href="#options">'.$this->l('Modify your options').'</a>';
 			echo '</fieldset>';
@@ -1556,7 +1584,7 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 		
 		
 
-			if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_)
+			if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_ AND $this->manualMode)
 			{
 				echo '<br class="clear"/>';
 				echo '<fieldset class="autoupgradeSteps"><legend>'.$this->l('Step').'</legend>';
@@ -1623,6 +1651,7 @@ echo '</script>';
 #upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .processing {border:2px outset grey;margin-top:1px;overflow: auto;}
+#dbResultCheck{ padding-left:20px;}
 </style>';
 		$this->displayWarning($this->l('This function is experimental. It\'s highly recommended to make a backup of your files and database before starting the upgrade process.'));
 
@@ -1716,6 +1745,7 @@ function addQuickInfo(arrQuickInfo){
 	$js .= '
 var firstTimeParams = '.$this->buildAjaxResult().';
 firstTimeParams = firstTimeParams.nextParams;
+firstTimeParams.firstTime = "1";
 
 $(document).ready(function(){
 	$(".upgradestep").click(function(e)
@@ -1757,7 +1787,7 @@ function parseXMLResult(xmlRet)
 		$("#dbCreateResultCheck")
 			.hide("slow");
 
-		// difference with the original function
+		// as xml is only after upgradeDb, the next step is always upgradeComplete
 		ret = {next:"upgradeComplete",nextParams:{typeResult:"json"},status:"ok"};
 
 	}
@@ -1812,12 +1842,14 @@ function afterBackupFiles()
 }
 
 function doAjaxRequest(action, nextParams){
+		// myNext, used when json is not available but response is correct
+		myNext = nextParams;
 		req = $.ajax({
 			type:"POST",
-			url : "'.($this->standalone? __PS_BASE_URI__ . trim($this->adminDir,'/').'/autoupgrade/ajax-upgradetab.php' : str_replace('index','ajax-tab',$currentIndex)).'",
+			url : "'.($this->standalone? __PS_BASE_URI__ . trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php' : str_replace('index','ajax-tab',$currentIndex)).'",
 			async: true,
 			data : {
-				dir:"'.trim($this->adminDir,'/').'",
+				dir:"'.trim($this->adminDir,DIRECTORY_SEPARATOR).'",
 				ajaxMode : "1",
 				token : "'.$this->token.'",
 				tab : "'.get_class($this).'",
@@ -1912,8 +1944,6 @@ function doAjaxRequest(action, nextParams){
  */
 function prepareNextButton(button_selector, nextParams)
 {
-//	myNext;
-	myNext = nextParams;
 	$(button_selector).unbind();
 	$(button_selector).click(function(e){
 		e.preventDefault();
diff --git a/modules/autoupgrade/Backup.php b/modules/autoupgrade/Backup.php
index 2254cfeb7..36de581ca 100644
--- a/modules/autoupgrade/Backup.php
+++ b/modules/autoupgrade/Backup.php
@@ -49,6 +49,7 @@ class BackupCore
 		if ($filename)
 			$this->id = $this->getRealBackupPath($filename);
 
+			Configuration::loadConfiguration();
 			$psBackupAll = Configuration::get('PS_BACKUP_ALL');
 			$psBackupDropTable = Configuration::get('PS_BACKUP_DROP_TABLE');
 			$this->psBackupAll = $psBackupAll !== false ? $psBackupAll : true;
diff --git a/modules/autoupgrade/Upgrader.php b/modules/autoupgrade/Upgrader.php
index ce87ff54a..c3c000581 100644
--- a/modules/autoupgrade/Upgrader.php
+++ b/modules/autoupgrade/Upgrader.php
@@ -40,6 +40,7 @@ class UpgraderCore{
 	public $version_num;
 	public $link;
 	public $autoupgrade;
+	public $autoupgrade_module;
 	public $changelog;
 	public $md5;
 
@@ -95,7 +96,10 @@ class UpgraderCore{
 	{
 		if (empty($this->link))
 		{
+			if (class_exists('Configuration'))
 			$lastCheck = Configuration::get('PS_LAST_VERSION_CHECK');
+			else
+				$lastCheck = 0;
 			// if we use the autoupgrade process, we will never refresh it
 			// except if no check has been done before
 			if ($force OR ($lastCheck < time() - (3600 * Upgrader::DEFAULT_CHECK_VERSION_DELAY_HOURS)) )
@@ -103,12 +107,14 @@ class UpgraderCore{
 				libxml_set_streams_context(stream_context_create(array('http' => array('timeout' => 3))));
 				if ($feed = @simplexml_load_file($this->rss_version_link))
 				{
+
 					$this->version_name = (string)$feed->version->name;
 					$this->version_num = (string)$feed->version->num;
 					$this->link = (string)$feed->download->link;
 					$this->md5 = (string)$feed->download->md5;
 					$this->changelog = (string)$feed->download->changelog;
 					$this->autoupgrade = (int)$feed->autoupgrade;
+					$this->autoupgrade_module = (int)$feed->autoupgrade_module;
 					$this->desc = (string)$feed->desc ;
 					$configLastVersion = array(
 						'name' => $this->version_name,
@@ -116,13 +122,17 @@ class UpgraderCore{
 						'link' => $this->link,
 						'md5' => $this->md5,
 						'autoupgrade' => $this->autoupgrade,
+						'autoupgrade_module' => $this->autoupgrade_module,
 						'changelog' => $this->changelog,
 						'desc' => $this->desc
 					);
+					if (class_exists('Configuration'))
+					{
 					Configuration::updateValue('PS_LAST_VERSION',serialize($configLastVersion));
 					Configuration::updateValue('PS_LAST_VERSION_CHECK',time());
 				}
 			}
+			}
 			else
 			{
 				$lastVersionCheck = @unserialize(Configuration::get('PS_LAST_VERSION'));
@@ -130,6 +140,7 @@ class UpgraderCore{
 				$this->version_num = $lastVersionCheck['num'];
 				$this->link = $lastVersionCheck['link'];
 				$this->autoupgrade = $lastVersionCheck['autoupgrade'];
+				$this->autoupgrade_module = $lastVersionCheck['autoupgrade_module'];
 				$this->md5 = $lastVersionCheck['md5'];
 				$this->desc = $lastVersionCheck['desc'];
 				$this->changelog = $lastVersionCheck['changelog'];
diff --git a/modules/autoupgrade/ajax-upgradetab.php b/modules/autoupgrade/ajax-upgradetab.php
index e83960b50..e0be1d26a 100644
--- a/modules/autoupgrade/ajax-upgradetab.php
+++ b/modules/autoupgrade/ajax-upgradetab.php
@@ -28,19 +28,22 @@
 if($_POST['action'] == 'upgradeDb')
 		require_once(dirname(__FILE__).'/../../config/config.inc.php');
 
-// require('Tools.php');
-// require('../../config/config.autoupgrade.inc.php');
+// ajax-upgrade-tab is located in admin/autoupgrade directory
 if(!defined('_PS_ROOT_DIR_'))
-	define('_PS_ROOT_DIR_', dirname(__FILE__).'/../../');
+	define('_PS_ROOT_DIR_', realpath(dirname(__FILE__).'/../../'));
 require_once(_PS_ROOT_DIR_.'/config/settings.inc.php');
 if(!defined('_PS_MODULE_DIR_'))
-	define('_PS_MODULE_DIR_', _PS_ROOT_DIR_ .'modules/');
+	define('_PS_MODULE_DIR_', _PS_ROOT_DIR_ .'/modules/');
+
 define('AUTOUPGRADE_MODULE_DIR', _PS_MODULE_DIR_.'autoupgrade/');
 require_once(AUTOUPGRADE_MODULE_DIR.'functions.php');
 if(!defined('_PS_USE_SQL_SLAVE_'))
 	define('_PS_USE_SQL_SLAVE_',0);
 // dir = admin-dev
-define('_PS_ADMIN_DIR_', _PS_ROOT_DIR_.'/'.$_POST['dir']);
+if ( _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$_POST['dir'] !==  realpath(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$_POST['dir']))
+	die('not allowed');
+
+define('_PS_ADMIN_DIR_', _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$_POST['dir']);
 define('PS_ADMIN_DIR', _PS_ADMIN_DIR_); // Retro-compatibility
 //require(_PS_ADMIN_DIR_.'/functions.php');
 include(AUTOUPGRADE_MODULE_DIR.'init.php');
diff --git a/modules/autoupgrade/autoupgrade.php b/modules/autoupgrade/autoupgrade.php
index 861d42d49..bc83318bb 100644
--- a/modules/autoupgrade/autoupgrade.php
+++ b/modules/autoupgrade/autoupgrade.php
@@ -26,14 +26,9 @@ class Autoupgrade extends Module
 	}
 	function install()
 	{
-		$autoupgradeCanWork = true;
-		if (!$autoupgradeCanWork)
-			return false;
 
 		$res = true;
 		// before adding AdminSelfUpgrade, we should remove AdminUpgrade
-		if (version_compare(_PS_VERSION_,'1.4.4.0','==') OR version_compare(_PS_VERSION_,'1.4.4.1','=='))
-		{
 			$idTab = Tab::getIdFromClassName('AdminUpgrade');
 
 			if ($idTab)
@@ -41,7 +36,6 @@ class Autoupgrade extends Module
 			$tab = new Tab($idTab);
 				$res &= $tab->delete();
 		}
-		}
 		
 		$idTab = Tab::getIdFromClassName('AdminSelfUpgrade');
 		// Then we add AdminSelfUpgrade only if not exists
@@ -55,9 +49,7 @@ class Autoupgrade extends Module
 			$res &= $tab->save();
 		}
 		else
-		{
 			$tab = new Tab($idTab);
-		}
 			Configuration::updateValue('PS_AUTOUPDATE_MODULE_IDTAB',$tab->id);
 
 		$autoupgradeDir = _PS_ADMIN_DIR_.DIRECTORY_SEPARATOR.'autoupgrade';
@@ -68,6 +60,7 @@ class Autoupgrade extends Module
 		$path = dirname(__FILE__).'/';
 		
 		$res &= copy($path.'ajax-upgradetab.php',$autoupgradeDir . DIRECTORY_SEPARATOR . 'ajax-upgradetab.php');
+		$res &= copy($path.'logo.gif',_PS_ROOT_DIR_. DIRECTORY_SEPARATOR . 'img/t/AdminSelfUpgrade.gif');
 		
 		if (!$res 
 			OR !Tab::getIdFromClassName('AdminSelfUpgrade')
@@ -94,6 +87,7 @@ class Autoupgrade extends Module
 			$res = $tab->save();
 		}
 		
+		if (file_exists(_PS_ADMIN_DIR_.DIRECTORY_SEPARATOR.'autoupgrade'.DIRECTORY_SEPARATOR.'ajax-upgradetab.php'))
 		$res &= @unlink(_PS_ADMIN_DIR_.DIRECTORY_SEPARATOR.'autoupgrade'.DIRECTORY_SEPARATOR.'ajax-upgradetab.php');
 		if($res OR !parent::uninstall())
 			return false;
diff --git a/modules/autoupgrade/de.php b/modules/autoupgrade/de.php
index 03ebff7d2..502a68288 100644
--- a/modules/autoupgrade/de.php
+++ b/modules/autoupgrade/de.php
@@ -1,56 +1,56 @@
 <?php
+
 global $_MODULE;
 $_MODULE = array();
-
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_19f823c6453c2b1ffd09cb715214813d'] = 'Pflichtfelder';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_760c4026bc5a0bd5378e6efc3f1370b4'] = 'Zu lang!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_4f2e28904946a09d8c7f36dd3ee72457'] = 'Die Felder sind unterschiedlich!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_43b01d1a6c5065545c65f42003b0ab5c'] = 'Falsche Adresse!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_2e170dfd78c2171a25605ececc0950a4'] = 'Kann E-Mail nicht senden!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_6deee80e4bdb8894331994116818558e'] = 'Fehler beim Erstellen der Konfigurationsdatei, wenn die Datei /config/ settings.inc.php existiert, geben Sie ihr bitte die offiziellen Schreibrechte, ansonsten erstellen Sie bitte eine Datei settings.inc.php im Konfigurationsverzeichnis (/config/)';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_aa946cb00b1c23ff6553b6f9e05da151'] = 'Die Settings-Datei konnte nicht geschrieben werden, erstellen Sie bitte eine Datei namens settings.inc.php in Ihrem Konfigurationsverzeichnis.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_e930e2474c664a3a7e89ecfb8793694b'] = 'Kann Datei nicht senden!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_774fc7a0f56391abc5d8856f2436ca07'] = 'Die Integrität der Daten ist nicht bestätigt.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_8fd007bf08e0717537825a3e91cb4fcc'] = 'Kann den Inhalt einer *.sql-Datei nicht lesen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_c71e825f6873f64b91efc26313614eab'] = 'Kann nicht auf den Inhalt einer *.sql-Datei zugreifen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_3d5c8f1d29b1a1dc4ea0673122e0d277'] = 'Fehler beim Einfügen in die Datenbank:';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_17e1581d01152347bfaacd153b961379'] = 'Falsches Kennwort (alpha-numerischer String aus mindestens 8 Zeichen)';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_9b9f3b2f8a4dffcad9188c8fc4b468c8'] = 'Eine PrestaShop Datenbank existiert bereits mit diesem Präfix, Sie müssen sie manuell löschen oder das Präfix ändern.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_bc5e1163a15106f9e941a7603124709d'] = 'Dies ist kein gültiger Name.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_a9d82945b8603f0c8807958d7db9a24d'] = 'Dies ist kein gültiges Bild.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_b37eef07b764ea58eec9afe624e20a40'] = 'Fehler beim Erstellen der Datei /config/settings.inc.php.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_3d9f514d46849760ef1b1412e314fd99'] = 'Fehler:';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_504053ab4c6d648edf11624f1bea4bb4'] = 'Diese PrestaShop-Datenbank existiert schon, bitte bestätigen Sie der Datenbank erneut Ihre Kennungen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_d7a99f61bb284d096ea4f221784af85a'] = 'Bei der Änderung des Bildmaßstabs ist ein Fehler aufgetreten.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_428c933bafbf262d693fbf1c22c03e5d'] = 'Die Datenbank wurde gefunden!';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_76bd190129b7aefb90fdf42f09ec3ec7'] = 'Der Datenbank-Server steht zur Verfügung, aber die Datenbank wurde nicht gefunden';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_045f4b5c3f990e5a26e2837495d68259'] = 'Der Datenbank-Server wurde nicht gefunden, bitte prüfen Sie Ihren Benutzernamen oder den Server-Namen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_757fc72e8d69106dd2cf9da22cc7adb1'] = 'Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte prüfen Sie Ihre Einstellungen.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_d18ad19290b3bfc3cd0d7badbb6cb6a3'] = 'Kann Bild /img/logo.jpg nicht schreiben. Falls es bereits existiert, löschen Sie es bitte manuell.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_2368e33e3e01d53abb9b60061ab83903'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_a10ef376d9f4c877ac86d8e4350116bf'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_f8fe8cba1625eaf8e5c253b041d57dbd'] = 'Die Datei wurde teilweise gesendet.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_8c9067e52e4440d8a20e74fdc745b0c6'] = 'Es ist keine Datei gesandt worden';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_2384d693d9af53b4727c092af7570a19'] = 'Der temporäre Ordner Ihrer empfangenen Dateisendungen fehlt. Bitte wenden Sie sich an Ihren Systemadministrator.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_f5985b2c059d5cc36968baab7585baba'] = 'Kann die Datei nicht auf die Festplatte schreiben';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_9e54dfe54e03b0010c1fe70bd65cd5e6'] = 'Datei Senden unterbrochen aufgrund falscher Erweiterung';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_32af3a59b50e98d254d6c03c5b320a94'] = 'Kann die Daten aus Ihrer Datenbank nicht in UTF-8 zu konvertieren.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_989a45a4ca01ee222f4370172bf8850d'] = 'Ungültiger Shopname';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_68499acecfba9d3bf0ca8711f300d3ed'] = 'Ihr Vorname enthält ungültige Zeichen';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_2399cf4ca7b49f2706f6e147a32efa78'] = 'Ihr Nachname enthält ungültige Zeichen';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_7d72600fcff52fb3a2d2f73572117311'] = 'Ihr Datenbank-Server unterstützt keinen UTF-8-Zeichensatz.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_5b9bbadcf96f15e7f112c13a9e5f076e'] = 'Diese Datenbank-Engine wird nicht unterstützt, bitte wählen Sie eine andere als MyISAM';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_24b481455c1b72b0c2539e7d516b9582'] = 'Die Datei /img/logo.jpg kann nicht geschrieben werden, bitte ändern Sie die Dateirechte mit CHMOD 755 oder CHMOD 777';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_5746b74663148afffd1350c97d4fcdfe'] = 'Feld Katalog-Modus ungültig';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_dafe44b99256a7783bc37f4f949da373'] = 'Der Installer ist zu alt.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_37ce0f29c7377c827e7247fe5645a782'] = 'Sie besitzen bereits die Version. %s';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_89928a14f2090aec4fd7aff9ea983f95'] = 'Keine frühere Version erkannt. Haben Sie die Datei settings.inc.php aus dem Ordner config gelöscht oder umbenannt?';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_5276a8cbd9e3e467396089b267564f51'] = 'Die Datei config/settings.inc.php wurde nicht gefunden. Haben Sie sie gelöscht oder umbenannt?';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_24784d9e80638781b74c017b33d8ca0c'] = 'Kann eine der SQL-Update-Dateien nicht finden. Bitte stellen Sie sicher, dass der Ordner /install/sql/upgrade nicht leer ist.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_580e4b216e324f675f0237cdb34b6c2d'] = 'Kein Update verfügbar';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_f15e7e7292b0c72894cf45a893e0d497'] = 'Fehler beim Öffnen der SQL-Datei';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_b8286438fbb6c7df9129fadc5316c19f'] = 'Fehler beim Einfügen in die Datenbank';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_229ee8046cafc09ddaf46fb9db710e91'] = 'Leider';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_e805a556799b7cef40e9760c81d99218'] = 'Es sind SQL-Fehler aufgetreten.';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_5627353fd6ac678497af3ece05087068'] = 'Die Datei config/defines.inc.php wurde nicht gefunden. Wo ist sie?';
-$_MODULE['<{autoupgrade}prestashop>AdminSelfUpgrade_783e8e29e6a8c3e22baa58a19420eb4f'] = 'Sekunden';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_19f823c6453c2b1ffd09cb715214813d'] = 'Pflichtfelder';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_760c4026bc5a0bd5378e6efc3f1370b4'] = 'Zu lang!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4f2e28904946a09d8c7f36dd3ee72457'] = 'Die Felder sind unterschiedlich!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_43b01d1a6c5065545c65f42003b0ab5c'] = 'Falsche Adresse!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2e170dfd78c2171a25605ececc0950a4'] = 'Kann E-Mail nicht senden!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_6deee80e4bdb8894331994116818558e'] = 'Fehler beim Erstellen der Konfigurationsdatei, wenn die Datei /config/ settings.inc.php existiert, geben Sie ihr bitte die offiziellen Schreibrechte, ansonsten erstellen Sie bitte eine Datei settings.inc.php im Konfigurationsverzeichnis (/config/)';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_aa946cb00b1c23ff6553b6f9e05da151'] = 'Die Settings-Datei konnte nicht geschrieben werden, erstellen Sie bitte eine Datei namens settings.inc.php in Ihrem Konfigurationsverzeichnis.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e930e2474c664a3a7e89ecfb8793694b'] = 'Kann Datei nicht senden!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_774fc7a0f56391abc5d8856f2436ca07'] = 'Die Integrität der Daten ist nicht bestätigt.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8fd007bf08e0717537825a3e91cb4fcc'] = 'Kann den Inhalt einer *.sql-Datei nicht lesen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_c71e825f6873f64b91efc26313614eab'] = 'Kann nicht auf den Inhalt einer *.sql-Datei zugreifen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3d5c8f1d29b1a1dc4ea0673122e0d277'] = 'Fehler beim Einfügen in die Datenbank:';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_17e1581d01152347bfaacd153b961379'] = 'Falsches Kennwort (alpha-numerischer String aus mindestens 8 Zeichen)';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_9b9f3b2f8a4dffcad9188c8fc4b468c8'] = 'Eine PrestaShop Datenbank existiert bereits mit diesem Präfix, Sie müssen sie manuell löschen oder das Präfix ändern.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_bc5e1163a15106f9e941a7603124709d'] = 'Dies ist kein gültiger Name.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a9d82945b8603f0c8807958d7db9a24d'] = 'Dies ist kein gültiges Bild.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b37eef07b764ea58eec9afe624e20a40'] = 'Fehler beim Erstellen der Datei /config/settings.inc.php.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_3d9f514d46849760ef1b1412e314fd99'] = 'Fehler:';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_504053ab4c6d648edf11624f1bea4bb4'] = 'Diese PrestaShop-Datenbank existiert schon, bitte bestätigen Sie der Datenbank erneut Ihre Kennungen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d7a99f61bb284d096ea4f221784af85a'] = 'Bei der Änderung des Bildmaßstabs ist ein Fehler aufgetreten.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_428c933bafbf262d693fbf1c22c03e5d'] = 'Die Datenbank wurde gefunden!';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_76bd190129b7aefb90fdf42f09ec3ec7'] = 'Der Datenbank-Server steht zur Verfügung, aber die Datenbank wurde nicht gefunden';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_045f4b5c3f990e5a26e2837495d68259'] = 'Der Datenbank-Server wurde nicht gefunden, bitte prüfen Sie Ihren Benutzernamen oder den Server-Namen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_757fc72e8d69106dd2cf9da22cc7adb1'] = 'Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte prüfen Sie Ihre Einstellungen.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d18ad19290b3bfc3cd0d7badbb6cb6a3'] = 'Kann Bild /img/logo.jpg nicht schreiben. Falls es bereits existiert, löschen Sie es bitte manuell.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2368e33e3e01d53abb9b60061ab83903'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a10ef376d9f4c877ac86d8e4350116bf'] = 'Die gesendete Datei überschreitet die maximal zulässige Größe.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f8fe8cba1625eaf8e5c253b041d57dbd'] = 'Die Datei wurde teilweise gesendet.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8c9067e52e4440d8a20e74fdc745b0c6'] = 'Es ist keine Datei gesandt worden';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2384d693d9af53b4727c092af7570a19'] = 'Der temporäre Ordner Ihrer empfangenen Dateisendungen fehlt. Bitte wenden Sie sich an Ihren Systemadministrator.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f5985b2c059d5cc36968baab7585baba'] = 'Kann die Datei nicht auf die Festplatte schreiben';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_9e54dfe54e03b0010c1fe70bd65cd5e6'] = 'Datei Senden unterbrochen aufgrund falscher Erweiterung';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_32af3a59b50e98d254d6c03c5b320a94'] = 'Kann die Daten aus Ihrer Datenbank nicht in UTF-8 zu konvertieren.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_989a45a4ca01ee222f4370172bf8850d'] = 'Ungültiger Shopname';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_68499acecfba9d3bf0ca8711f300d3ed'] = 'Ihr Vorname enthält ungültige Zeichen';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_2399cf4ca7b49f2706f6e147a32efa78'] = 'Ihr Nachname enthält ungültige Zeichen';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_7d72600fcff52fb3a2d2f73572117311'] = 'Ihr Datenbank-Server unterstützt keinen UTF-8-Zeichensatz.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5b9bbadcf96f15e7f112c13a9e5f076e'] = 'Diese Datenbank-Engine wird nicht unterstützt, bitte wählen Sie eine andere als MyISAM';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_24b481455c1b72b0c2539e7d516b9582'] = 'Die Datei /img/logo.jpg kann nicht geschrieben werden, bitte ändern Sie die Dateirechte mit CHMOD 755 oder CHMOD 777';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5746b74663148afffd1350c97d4fcdfe'] = 'Feld Katalog-Modus ungültig';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_dafe44b99256a7783bc37f4f949da373'] = 'Der Installer ist zu alt.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_37ce0f29c7377c827e7247fe5645a782'] = 'Sie besitzen bereits die Version. %s';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_89928a14f2090aec4fd7aff9ea983f95'] = 'Keine frühere Version erkannt. Haben Sie die Datei settings.inc.php aus dem Ordner config gelöscht oder umbenannt?';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5276a8cbd9e3e467396089b267564f51'] = 'Die Datei config/settings.inc.php wurde nicht gefunden. Haben Sie sie gelöscht oder umbenannt?';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_24784d9e80638781b74c017b33d8ca0c'] = 'Kann eine der SQL-Update-Dateien nicht finden. Bitte stellen Sie sicher, dass der Ordner /install/sql/upgrade nicht leer ist.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_580e4b216e324f675f0237cdb34b6c2d'] = 'Kein Update verfügbar';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_f15e7e7292b0c72894cf45a893e0d497'] = 'Fehler beim Öffnen der SQL-Datei';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_b8286438fbb6c7df9129fadc5316c19f'] = 'Fehler beim Einfügen in die Datenbank';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_229ee8046cafc09ddaf46fb9db710e91'] = 'Leider';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_e805a556799b7cef40e9760c81d99218'] = 'Es sind SQL-Fehler aufgetreten.';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5627353fd6ac678497af3ece05087068'] = 'Die Datei config/defines.inc.php wurde nicht gefunden. Wo ist sie?';
+$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_783e8e29e6a8c3e22baa58a19420eb4f'] = 'Sekunden';
diff --git a/modules/autoupgrade/fr.php b/modules/autoupgrade/fr.php
index e52758e9e..f1de5b9bb 100644
--- a/modules/autoupgrade/fr.php
+++ b/modules/autoupgrade/fr.php
@@ -2,7 +2,6 @@
 
 global $_MODULE;
 $_MODULE = array();
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_875b8a59022d232837491c0fdfacb4ab'] = 'Ne pas sauver les images';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_a8d6c6734da0083021561b23f2fa88cc'] = 'Vous pouvez exclure le dossier image de la sauvegarde si vous l\'avez déjà sauvegardé d\'une autre manière (non recommandé)';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_af98608eaedd4ba7ffd47a0204e84b23'] = 'Conserver le thème \"prestashop\" actuel';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_4ea56ca1a757e426911ff20889c0e93c'] = 'Si vous avez personnalisé le thème par défaut de PrestaShop, vous pouvez le protéger de la mise à niveau (non recommandé)';
@@ -31,12 +30,9 @@ $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_63ded4905ba41ac4bf00373df273
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_11978affb3b0dbb16c50d571fd05de6d'] = 'erreur lors  de la création du répertoire %s';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_1b854285afc1988b6f83414fde5943ab'] = '%1$s copié dans %2$s. encore %3$s fichiers à mettre à jour.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0e06ce0972ad338e1d96e8589dc21b9c'] = 'erreur lors de la copie de %1$s vers %2$s';
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_0511620a3a1d6036d3fbe47b131d7c4b'] = 'Fichiers restorés. Restauration de la base de données.';
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_791403f158965a3e19f8627c7b744126'] = 'Base de données restaurée.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_5f7f50973696d0a42c1efcc07f7820a0'] = 'Votre site est maintenant restauré.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_28517b8a291c50d80aa53a078407065b'] = 'Répertoire racine nettoyée.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_bb71892737d721949538d6e1c4d3d22d'] = 'Fichiers restaurés. Sauvegarde de la base de données non trouvée. Restauration terminée.';
-$_MODULE['<{autoupgrade}prestashop>adminselfupgrade_cb7dce5f6a1934d54c0d3335c7ffe841'] = 'Fichiers restaurés.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_8efc36d230f76fbfd9e4d758964e9414'] = 'impossible d\'extraire %1$ s dans%2$s.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_d7624db09c15d46cd37d7709ae05e44b'] = 'aucune sauvegarde trouvée. Il n\'y a rien à restaurer.';
 $_MODULE['<{autoupgrade}prestashop>adminselfupgrade_09a362e2dd3800f8fbc55d3446513f65'] = 'Rien à restaurer (aucune requête trouvée)';
diff --git a/modules/blocklayered/blocklayered-ajax-back.php b/modules/blocklayered/blocklayered-ajax-back.php
index 9e378e4fc..e69192e7d 100644
--- a/modules/blocklayered/blocklayered-ajax-back.php
+++ b/modules/blocklayered/blocklayered-ajax-back.php
@@ -28,6 +28,10 @@
 /* Getting cookie or logout */
 include(dirname(__FILE__).'/../../config/config.inc.php');
 require_once(dirname(__FILE__).'/../../init.php');
+
+if (substr(Tools::encrypt('blocklayered/index'),0,10) != Tools::getValue('layered_token') || !Module::isInstalled('blocklayered'))
+	die('Bad token');
+
 include(dirname(__FILE__).'/blocklayered.php');
 
 /* Clean categoryBox before use */
diff --git a/modules/blocklayered/blocklayered-indexer.php b/modules/blocklayered/blocklayered-indexer.php
index 60523382b..4d0dcb9bf 100644
--- a/modules/blocklayered/blocklayered-indexer.php
+++ b/modules/blocklayered/blocklayered-indexer.php
@@ -5,7 +5,7 @@ include(dirname(__FILE__).'/../../init.php');
 include(dirname(__FILE__).'/blocklayered.php');
 
 if (substr(Tools::encrypt('blocklayered/index'),0,10) != Tools::getValue('token') || !Module::isInstalled('blocklayered'))
-	die;
+	die('Bad token');
 
 if(Tools::getValue('full'))
 	echo BlockLayered::fullindexProcess((int)Tools::getValue('cursor'), (int)Tools::getValue('ajax'), true);
diff --git a/modules/blocklayered/blocklayered-url-indexer.php b/modules/blocklayered/blocklayered-url-indexer.php
new file mode 100644
index 000000000..f9cb401a0
--- /dev/null
+++ b/modules/blocklayered/blocklayered-url-indexer.php
@@ -0,0 +1,11 @@
+<?php
+
+include(dirname(__FILE__).'/../../config/config.inc.php');
+include(dirname(__FILE__).'/../../init.php');
+include(dirname(__FILE__).'/blocklayered.php');
+
+if (substr(Tools::encrypt('blocklayered/index'),0,10) != Tools::getValue('token') || !Module::isInstalled('blocklayered'))
+	die('Bad token');
+
+$blockLayered = new BlockLayered();
+echo $blockLayered->indexUrl((int)Tools::getValue('id_category'), (int)Tools::getValue('truncate'));
\ No newline at end of file
diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js
index 7eb2f2189..325d6d49d 100644
--- a/modules/blocklayered/blocklayered.js
+++ b/modules/blocklayered/blocklayered.js
@@ -26,6 +26,8 @@
 
 var ajaxQueries = new Array();
 var ajaxLoaderOn = 0;
+var sliderList = new Array();
+var slidersInit = false;
 
 $(document).ready(function()
 {
@@ -54,9 +56,76 @@ $(document).ready(function()
 		  }
 		});
 	paginationButton();
+	initLayered();
 	reloadContent();
 });
 
+function addSlider(type, data, unit)
+{
+	sliderList.push({
+		type: type,
+		data: data,
+		unit: unit
+	});
+}
+
+function initSliders()
+{
+	$(sliderList).each(function(i, slider){
+		$('#layered_'+slider['type']+'_slider').slider(slider['data']);
+		$('#layered_'+slider['type']+'_range').html($('#layered_'+slider['type']+'_slider').slider('values', 0)+slider['unit']+
+			' - ' + $('#layered_'+slider['type']+'_slider').slider('values', 1 )+slider['unit']);
+	});
+}
+
+function initLayered()
+{
+	initSliders();
+	var params = document.location.toString().split('#');
+	params.shift();
+	$(params).each(function(it, val)
+	{
+		if (val.split('=')[0] == 'price' || val.split('=')[0] == 'weight')
+		{
+			$("#layered_"+val.split('=')[0]+"_slider").slider('values', 0, val.split('=')[1].split('_')[0]);
+			$("#layered_"+val.split('=')[0]+"_slider").slider('values', 1, val.split('=')[1].split('_')[1]);
+			$("#layered_"+val.split('=')[0]+"_slider").slider('option', 'slide')(0,{values:[val.split('=')[1].split('_')[0], val.split('=')[1].split('_')[1]]});
+		}
+		else
+		{
+			$('#'+val.split('=')[0]).click();
+		}
+	});
+}
+
+function updatelink(link)
+{
+	baseUrl = link.split('#');
+	linkFilterUpdate = baseUrl[0]+getValueSelected();
+	return linkFilterUpdate;
+}
+
+function  getValueSelected(){
+	
+	var checkboxChecked = "";
+	$("#layered_form input:checkbox:checked").each(function(){
+		checkboxChecked += '#' + $(this).attr('id')+"="+$(this).val();
+	});
+	$("#layered_form input:hidden").each(function(){
+		checkboxChecked += '#' + $(this).attr('name')+"="+$(this).val();
+	});
+	$(['price','weight']).each(function(i, filter) {
+		if ($("#layered_"+filter+"_slider").length)
+		{
+			if (typeof($("#layered_"+filter+"_slider").slider('values', 0)) != 'object')
+			{
+				checkboxChecked += '#'+filter+'='+$("#layered_"+filter+"_slider").slider('values', 0)+'_'+$("#layered_"+filter+"_slider").slider('values', 1);
+			}
+		}
+	});
+	return checkboxChecked;
+}
+
 function paginationButton() {
 	$('#pagination li').not('.current, .disabled').each( function () {
 		var nbPage = 0;
@@ -82,8 +151,17 @@ function cancelFilter()
 {
 	$('#enabled_filters a').live('click', function(e)
 	{
+		if($(this).attr('rel').search(/_slider$/) > 0)
+		{
+			$('#'+$(this).attr('rel')).slider("values" , 0, $('#'+$(this).attr('rel')).slider( "option" , 'min' ));
+			$('#'+$(this).attr('rel')).slider("values" , 1, $('#'+$(this).attr('rel')).slider( "option" , 'max' ));
+			$('#'+$(this).attr('rel')).slider('option', 'slide')(0,{values:[$('#'+$(this).attr('rel')).slider( "option" , 'min' ), $('#'+$(this).attr('rel')).slider( "option" , 'max' )]});
+		}
+		else
+		{
 		$('#'+$(this).attr('rel')).attr('checked', false);
 		$('#layered_form input[name='+$(this).attr('rel')+']:hidden').remove();
+		}
 		reloadContent();
 		e.preventDefault();
 	});
@@ -110,6 +188,7 @@ function openCloseFilter()
 
 function reloadContent(params_plus)
 {
+	window.location =  updatelink( window.location.href);
 	for(i = 0; i < ajaxQueries.length; i++)
 		ajaxQueries[i].abort();
 	ajaxQueries = new Array();
@@ -157,6 +236,8 @@ function reloadContent(params_plus)
 			$('#layered_block_left').after('<div id="tmp_layered_block_left"></div>').remove();
 			$('#tmp_layered_block_left').html(result.filtersBlock).attr('id', 'layered_block_left');
 
+			$('.category-product-count').html(result.categoryCount);
+
 			$('#product_list').html(result.productList).html();
 			$('#product_list').css('opacity', '1');
 			$('div#pagination').html(result.pagination);
@@ -182,6 +263,7 @@ function reloadContent(params_plus)
 			if(typeof(reloadProductComparison) == 'function') {
 				reloadProductComparison();
 		}
+			initSliders();
 		}
 	});
 	ajaxQueries.push(ajaxQuery);
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index b6334dd63..91cb92594 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -52,7 +52,8 @@ class BlockLayered extends Module
 		if ($result = parent::install() && $this->registerHook('leftColumn') && $this->registerHook('header') && $this->registerHook('footer')
 		&& $this->registerHook('categoryAddition') && $this->registerHook('categoryUpdate') && $this->registerHook('attributeGroupForm')
 		&& $this->registerHook('afterSaveAttributeGroup') && $this->registerHook('afterDeleteAttributeGroup') && $this->registerHook('featureForm')
-		&& $this->registerHook('afterDeleteFeature') && $this->registerHook('afterSaveFeature') && $this->registerHook('categoryDeletion'))
+		&& $this->registerHook('afterDeleteFeature') && $this->registerHook('afterSaveFeature') && $this->registerHook('categoryDeletion')
+		&& $this->registerHook('afterSaveProduct') && $this->registerHook('productListAssign'))
 		{
 			Configuration::updateValue('PS_LAYERED_HIDE_0_VALUES', 0);
 			Configuration::updateValue('PS_LAYERED_SHOW_QTIES', 1);
@@ -63,6 +64,7 @@ class BlockLayered extends Module
 		
 		self::_installPriceIndexTable();
 		self::_installFriendlyUrlTable();
+		self::_installIndexableAttributeTable();
 
 		return $result;
 	}
@@ -73,6 +75,13 @@ class BlockLayered extends Module
 		Configuration::deleteByName('PS_LAYERED_HIDE_0_VALUES');
 		Configuration::deleteByName('PS_LAYERED_SHOW_QTIES');
 		
+		Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'price_static_index');
+		Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'layered_friendly_url');
+		Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'layered_indexable_attribute_group');
+		Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'layered_indexable_feature');
+		Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'layered_category');
+		Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'layered_filter');
+		
 		return parent::uninstall();
 	}
 	
@@ -91,13 +100,14 @@ class BlockLayered extends Module
 	private function _installFriendlyUrlTable()
 	{
 		Db::getInstance()->Execute('DROP TABLE IF EXISTS  `'._DB_PREFIX_.'layered_friendly_url`');
-		
 		Db::getInstance()->Execute('
 		CREATE TABLE `'._DB_PREFIX_.'layered_friendly_url` (
 		`id_layered_friendly_url` INT NOT NULL AUTO_INCREMENT,
 		`url_key` varchar(32) NOT NULL,
 		`data` varchar(200) NOT NULL,
-		PRIMARY KEY (`id_layered_friendly_url`)) ENGINE = '._MYSQL_ENGINE_);
+		`id_lang` INT NOT NULL,
+		PRIMARY KEY (`id_layered_friendly_url`),
+		INDEX `id_lang` (`id_lang`)) ENGINE = '._MYSQL_ENGINE_);
 
 		Db::getInstance()->Execute('CREATE INDEX `url_key` ON `'._DB_PREFIX_.'layered_friendly_url`(url_key(5))');
 	}
@@ -110,6 +120,9 @@ class BlockLayered extends Module
 		`id_attribute_group` INT NOT NULL,
 		`indexable` BOOL NOT NULL DEFAULT 0,
 		PRIMARY KEY (`id_attribute_group`)) ENGINE = '._MYSQL_ENGINE_);
+		Db::getInstance()->Execute('
+		INSERT INTO `'._DB_PREFIX_.'layered_indexable_attribute_group`
+		SELECT id_attribute_group, 1 FROM `'._DB_PREFIX_.'attribute_group`');
 		
 		Db::getInstance()->Execute('DROP TABLE IF EXISTS  `'._DB_PREFIX_.'layered_indexable_feature`');
 		Db::getInstance()->Execute('
@@ -117,75 +130,231 @@ class BlockLayered extends Module
 		`id_feature` INT NOT NULL,
 		`indexable` BOOL NOT NULL DEFAULT 0,
 		PRIMARY KEY (`id_feature`)) ENGINE = '._MYSQL_ENGINE_);
+		Db::getInstance()->Execute('
+		INSERT INTO `'._DB_PREFIX_.'layered_indexable_feature`
+		SELECT id_feature, 1 FROM `'._DB_PREFIX_.'feature`');
 	}
 	
 	/*
 	 * Url indexation
 	 */
-	static function _indexUrl()
+	public function indexUrl($idCategory = null, $truncate = true)
 	{
+		if($truncate)
+			Db::getInstance()->execute('TRUNCATE '._DB_PREFIX_.'layered_friendly_url');
 		
-		$categories = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT id_category FROM '._DB_PREFIX_.'layered_category GROUP BY id_category');
+		if(!empty($idCategory))
+			$categorySubQuery = ' AND lc.id_category = '.(int)$idCategory;
+		else
+			$categorySubQuery = '';
 		
-		if(!$categories)
+		$attributeValues = array();
+		$filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT lc.*, id_lang, name, link_rewrite, cl.id_category
+		FROM '._DB_PREFIX_.'layered_category lc
+		INNER JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = lc.id_category AND lc.id_category <> 1'.$categorySubQuery.')
+		ORDER BY position ASC');
+		if (!$filters)
 			return;
 		
-		// We want all attributes of each categories
-		$attributeValuesByCategory = array();
+		foreach ($filters as $filter)
+			switch ($filter['type'])
+			{
+				case 'id_attribute_group':
+					$attributes = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
+					SELECT agl.public_name name, a.id_attribute_group id_name, al.name value, a.id_attribute id_value, al.id_lang
+					FROM '._DB_PREFIX_.'attribute_group ag
+					INNER JOIN '._DB_PREFIX_.'attribute_group_lang agl ON (agl.id_attribute_group = ag.id_attribute_group)
+					INNER JOIN '._DB_PREFIX_.'attribute a ON (a.id_attribute_group = ag.id_attribute_group)
+					INNER JOIN '._DB_PREFIX_.'attribute_lang al ON (al.id_attribute = a.id_attribute)
+					INNER JOIN '._DB_PREFIX_.'layered_indexable_attribute_group liag ON (liag.id_attribute_group = a.id_attribute_group AND liag.indexable = 1)
+					WHERE a.id_attribute_group = '.(int)$filter['id_value'].' AND agl.id_lang = al.id_lang AND agl.id_lang = '.(int)$filter['id_lang']);
+					foreach ($attributes as $attribute)
+					{
+						if (!isset($attributeValues[$attribute['id_lang']]))
+							$attributeValues[$attribute['id_lang']] = array();
+						if (!isset($attributeValues[$attribute['id_lang']][$filter['id_category']]))
+							$attributeValues[$attribute['id_lang']][$filter['id_category']] = array();
+						if (!isset($attributeValues[$attribute['id_lang']][$filter['id_category']]['c'.$attribute['id_name']]))
+							$attributeValues[$attribute['id_lang']][$filter['id_category']]['c'.$attribute['id_name']] = array();
+						$attributeValues[$attribute['id_lang']][$filter['id_category']]['c'.$attribute['id_name']][] = array('name' => $attribute['name'],
+						'id_name' => 'c'.$attribute['id_name'], 'value' => $attribute['value'], 'id_value' => $attribute['id_value'],
+						'category_name' => $filter['link_rewrite'], 'type' => $filter['type']);
+					}
+					break;
+				
+				case 'id_feature':
+					$features = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
+					SELECT fl.name name, fl.id_feature id_name, fvl.id_feature_value id_value, fvl.value value, fl.id_lang
+					FROM '._DB_PREFIX_.'feature_lang fl
+					INNER JOIN '._DB_PREFIX_.'layered_indexable_feature lif ON (lif.id_feature = fl.id_feature AND indexable = 1)
+					INNER JOIN '._DB_PREFIX_.'feature_value fv ON (fv.id_feature = fl.id_feature)
+					INNER JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.id_feature_value = fv.id_feature_value)
+					WHERE fl.id_feature = '.(int)$filter['id_value'].' AND fvl.id_lang = fl.id_lang AND fvl.id_lang = '.(int)$filter['id_lang']);
+					foreach ($features as $feature)
+					{
+						if (!isset($attributeValues[$feature['id_lang']]))
+							$attributeValues[$feature['id_lang']] = array();
+						if (!isset($attributeValues[$feature['id_lang']][$filter['id_category']]))
+							$attributeValues[$feature['id_lang']][$filter['id_category']] = array();
+						if (!isset($attributeValues[$feature['id_lang']][$filter['id_category']]['f'.$feature['id_name']]))
+							$attributeValues[$feature['id_lang']][$filter['id_category']]['f'.$feature['id_name']] = array();
+						$attributeValues[$feature['id_lang']][$filter['id_category']]['f'.$feature['id_name']][] = array('name' => $feature['name'],
+						'id_name' => 'f'.$feature['id_name'], 'value' => $feature['value'], 'id_value' => $feature['id_value'],
+						'category_name' => $filter['link_rewrite'], 'type' => $filter['type']);
+					}
+					break;
+				
+				case 'category':
+					$categories = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
+					SELECT cl.name, cl.id_lang, c.id_category
+					FROM '._DB_PREFIX_.'category c
+					INNER JOIN '._DB_PREFIX_.'category_lang cl ON (c.id_category = cl.id_category)
+					WHERE nleft > (SELECT nleft FROM '._DB_PREFIX_.'category WHERE id_category = 2)
+					AND  nright < (SELECT nright FROM '._DB_PREFIX_.'category WHERE id_category = 2)
+					');
 		foreach($categories as $category)
 		{
-			$attributeValuesByCategory[(int)$category['id_category']] = array();
-			$filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$category['id_category'].' ORDER BY position ASC');
-			if(!$categories)
-				continue;
+						if (!isset($attributeValues[$category['id_lang']]))
+							$attributeValues[$category['id_lang']] = array();
+						if (!isset($attributeValues[$category['id_lang']][$filter['id_category']]))
+							$attributeValues[$category['id_lang']][$filter['id_category']] = array();
+						if (!isset($attributeValues[$category['id_lang']][$filter['id_category']]['cat'.$category['id_category']]))
+							$attributeValues[$category['id_lang']][$filter['id_category']]['cat'.$category['id_category']] = array();
+						$attributeValues[$category['id_lang']][$filter['id_category']]['cat'.$category['id_category']][] = array('name' => $this->l('Categories'),
+						'id_name' => null, 'value' => $category['name'], 'id_value' => $category['id_category'],
+						'category_name' => $filter['link_rewrite'], 'type' => $filter['type']);
 		}
+					$filter['id_category'];
+					break;
+					
+				case 'manufacturer':
+					// @TODO
+					break;
+				
+				case 'avaibility':
+					// @TODO
+					break;
 	}
+
+		// Foreach langs
+		foreach ($attributeValues as $id_lang => $tmp1)
+	{
+			// Foreach categories
+			foreach ($tmp1 as $id_category => $tmp2)
+			{
+				$cursors = array_fill(0, count($tmp2), 0);
+				$limits = array();
+				$nbName = count($tmp2);
+				$nbPosibilities = 1;
+				$tmp2 = array_values($tmp2);
+		
+				// fill limits and calculate the number of combination possible
+				foreach ($tmp2 as $name)
+				{
+					$count = count($name)+1;
+					$limits[] = $count;
+					$nbPosibilities *= $count;
+				}
+				
+				// Loop all url posibilities
+				for ($i = 1; $i < $nbPosibilities; $i++)
+				{
+					// generate all parameters posibilities
+					$a = 1;
+					foreach ($cursors as $position => $cursor)
+					{
+						// Get all possible combination (one by group)
+						// 0 means no combinations selected in the group
+						$cursors[$position] = (($i / ($a)) % $limits[$position]);
+						$a *= $limits[$position];
+					}
+					
+					$link = '';
+					$selectedFilters = array('category' => array());
+					
+					// Generate url with selected filters
+					foreach ($cursors as $position => $cursor)
+					{
+						if ($cursor != 0)
+						{
+							$link .= '/'.Tools::link_rewrite($tmp2[$position][$cursor-1]['name'].'-'.$tmp2[$position][$cursor-1]['value']);
+							if (!isset($selectedFilters[$tmp2[$position][$cursor-1]['type']]))
+								$selectedFilters[$tmp2[$position][$cursor-1]['type']] = array();
+							$selectedFilters[$tmp2[$position][$cursor-1]['type']][$tmp2[$position][$cursor-1]['id_value']] = $tmp2[$position][$cursor-1]['id_value'];
+						}
+					}
+					
+					$urlKey = md5($link);
+					$idLayeredFriendlyUrl = Db::getInstance()->getValue('SELECT id_layered_friendly_url FROM `'._DB_PREFIX_.'layered_friendly_url` WHERE `url_key` = \''.$urlKey.'\'');
+					if ($idLayeredFriendlyUrl == false)
+					{
+						Db::getInstance()->AutoExecute(_DB_PREFIX_.'layered_friendly_url', array('url_key' => $urlKey, 'data' => serialize($selectedFilters), 'id_lang' => $id_lang), 'INSERT');
+						$idLayeredFriendlyUrl = Db::getInstance()->Insert_ID();
+					}
+				}
+			}
+		}
+		return 1;
+	}
+	
+	public function hookProductListAssign($params)
+	{
+		if (!Configuration::get('PS_LAYERED_INDEXED'))
+			return;
+		$params['hookExecuted'] = true;
+		$params['catProducts'] = array();
+		$selectedFilters = $this->getSelectedFilters();
+		$this->getProducts($selectedFilters, $params['catProducts'], $params['nbProducts'], $p, $n, $pages_nb, $start, $stop, $range);
+	}
+	
+	public function hookAfterSaveProduct($params)
+	{
+		if (!$params['id_product'])
+			return;
+		
+		self::indexProduct((int)$params['id_product']);
+	}
+
 	public function hookAfterSaveFeature($params)
 	{
-		$idFeature = $params['id_feature'];
-		
-		if(!$idFeature)
-			return;
-		if(Tools::getValue('layered_indexable') === false)
+		if (!$params['id_feature'] || Tools::getValue('layered_indexable') === false)
 			return;
 		
-		Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$idFeature);
-		Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature VALUES ('.(int)$idFeature.', '.(int)Tools::getValue('layered_indexable').')');
+		Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$params['id_feature']);
+		Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature VALUES ('.(int)$params['id_feature'].', '.(int)Tools::getValue('layered_indexable').')');
 	}
+
 	public function hookAfterDeleteFeature($params)
 	{
-		$idFeature = $params['id_feature'];
-		
-		if(!$idFeature)
+		if (!$params['id_feature'])
 			return;
-		Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$idFeature);
+		Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$params['id_feature']);
 	}
 	
 	public function hookAfterSaveAttributeGroup($params)
 	{
-		$idAttributeGroup = $params['id_attribute_group'];
-		
-		if(!$idAttributeGroup)
-			return;
-		if(Tools::getValue('layered_indexable') === false)
+		if (!$params['id_attribute_group'] || Tools::getValue('layered_indexable') === false)
 			return;
 		
-		Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$idAttributeGroup);
-		Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_group VALUES ('.(int)$idAttributeGroup.', '.(int)Tools::getValue('layered_indexable').')');
+		Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$params['id_attribute_group']);
+		Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_group VALUES ('.(int)$params['id_attribute_group'].', '.(int)Tools::getValue('layered_indexable').')');
 	}
+	
 	public function hookAfterDeleteAttributeGroup($params)
 	{
-		$idAttributeGroup = $params['id_attribute_group'];
-		
-		if(!$idAttributeGroup)
+		if (!$params['id_attribute_group'])
 			return;
-		Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$idAttributeGroup);
+
+		Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$params['id_attribute_group']);
 	}
 	
 	public function hookAttributeGroupForm($params)
 	{
-		$idAttributeGroup = $params['id_attribute_group'];
-		$on = (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT indexable FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$idAttributeGroup);
+		$indexable = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT indexable FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$params['id_attribute_group']);
+		if($indexable === false)
+			$on = true;
+		else
+			$on = (bool)$indexable;
 		
 		return '<label>'.$this->l('Indexable:').' </label>
 				<div class="margin-form">
@@ -199,12 +368,14 @@ class BlockLayered extends Module
 	
 	public function hookFeatureForm($params)
 	{
-		$this->registerHook('afterDeleteFeature');
-		$this->registerHook('afterSaveFeature');
-		$idAttributeGroup = $params['id_attribute_group'];
-		$on = (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT indexable FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$idAttributeGroup);
+		$indexable = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT indexable FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$params['id_feature']);
+		if($indexable === false)
+			$on = true;
+		else
+			$on = (bool)$indexable;
 		
-		return '<label>'.$this->l('Indexable:').' </label>
+		return '
+		<label>'.$this->l('Indexable:').' </label>
 				<div class="margin-form">
 					<input type="radio" '.(($on)?'checked="checked"':'').' value="1" id="indexable_on" name="layered_indexable">
 					<label for="indexable_on" class="t"><img title="Yes" alt="Enabled" src="../img/admin/enabled.gif"></label>
@@ -301,7 +472,7 @@ class BlockLayered extends Module
 			WHERE `active` = 1 AND psi.id_product is null
 			ORDER by id_product LIMIT 0,'.(int)$length;
 		
-		foreach (Db::getInstance()->executeS($query) as $product)
+		foreach (Db::getInstance()->ExecuteS($query) as $product)
 			self::indexProduct((int)$product['id_product'], ($smart AND $full));
 
 		return (int)($cursor + $length);
@@ -333,7 +504,7 @@ class BlockLayered extends Module
 		LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (tr.id_tax_rules_group = trg.id_tax_rules_group)
 		LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.id_tax = tr.id_tax AND t.active = 1)
 		WHERE id_product = '.(int)$idProduct.'
-		GROUP BY id_product;');
+		GROUP BY id_product');
 		
 		$productMinPrices = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
 		SELECT id_shop, id_currency, id_country, id_group, from_quantity
@@ -341,6 +512,24 @@ class BlockLayered extends Module
 		WHERE id_product = '.(int)$idProduct);
 		
 		// Get min price
+		foreach ($currencyList as $currency)
+		{
+			$price = Product::priceCalculation(null, (int)$idProduct, null, null, null, null,
+				$currency['id_currency'], null, null, false, true, false, true, true,
+				$specificPriceOutput, true);
+			
+			if (!isset($maxPrice[$currency['id_currency']]))
+				$maxPrice[$currency['id_currency']] = 0;
+			if (!isset($minPrice[$currency['id_currency']]))
+				$minPrice[$currency['id_currency']] = null;
+			if ($price > $maxPrice[$currency['id_currency']])
+				$maxPrice[$currency['id_currency']] = $price;
+			if ($price == 0)
+				continue;
+			if (is_null($minPrice[$currency['id_currency']]) OR $price < $minPrice[$currency['id_currency']])
+				$minPrice[$currency['id_currency']] = $price;
+		}
+		
 		foreach ($productMinPrices as $specificPrice)
 			foreach ($currencyList as $currency)
 			{
@@ -381,10 +570,13 @@ class BlockLayered extends Module
 					$minPrice[$currency['id_currency']] = $price;
 			}
 		
+		$values = array();
 		foreach ($currencyList as $currency)
+			$values[] = '('.(int)$idProduct.', '.(int)$currency['id_currency'].', '.(int)$minPrice[$currency['id_currency']].', '.(int)$maxPrice[$currency['id_currency']].')';
+		
 			Db::getInstance()->Execute('
 			INSERT INTO `'._DB_PREFIX_.'price_static_index` (id_product, id_currency, price_min, price_max)
-			VALUES ('.(int)$idProduct.', '.(int)$currency['id_currency'].', '.(int)$minPrice[$currency['id_currency']].', '.(int)$maxPrice[$currency['id_currency']].')');
+			VALUES '.implode(',', $values));
 	}
 
 	public function hookLeftColumn($params)
@@ -399,9 +591,9 @@ class BlockLayered extends Module
 
 	public function hookHeader($params)
 	{
-		$id_parent = (int)Tools::getValue('id_category', Tools::getValue('id_category_layered', 1));
-		if ($id_parent == 1)
+		if (Tools::getValue('id_category', Tools::getValue('id_category_layered', 1)) == 1)
 			return;
+
 		Tools::addJS(($this->_path).'blocklayered.js');
 		Tools::addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js');
 		Tools::addCSS(_PS_CSS_DIR_.'jquery-ui-1.8.10.custom.css', 'all');
@@ -446,23 +638,20 @@ class BlockLayered extends Module
 	{
 		global $cookie;
 
-		$errors = array();
 		$html = '';
 
-		if (!extension_loaded('curl'))
-			$html .= '<div class="warn"><p>'.$this->l('You must enable cURL extension on your server if you want to use short link.').'</p></div>';
-
-		if (Tools::isSubmit('submitLayeredCache'))
+		if (Tools::isSubmit('SubmitFilter'))
 		{
-			$this->rebuildLayeredStructure();
-			$this->rebuildLayeredCache();
 			
+			if(!Tools::getValue('layered_tpl_name'))
 			$html .= '
-			<div class="conf">
-				<img src="../img/admin/ok2.png" alt="" /> '.$this->l('Layered navigation database was initialized successfully').'
+				<div class="error">
+					<span style="float:right">
+						<a href="" id="hideError"><img src="../img/admin/close.png" alt="X"></a>
+					</span>
+					<img src="../img/admin/error2.png">'.$this->l('Filter template name required (cannot be empty)').'
 			</div>';
-		}
-		elseif (Tools::isSubmit('SubmitFilter'))
+			else
 		{
 			if (isset($_POST['id_layered_filter']) AND $_POST['id_layered_filter'])
 				Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_filter WHERE id_layered_filter = '.(int)Tools::getValue('id_layered_filter'));
@@ -485,6 +674,8 @@ class BlockLayered extends Module
 				Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_category WHERE id_category IN ('.implode(',', $_POST['categoryBox']).')');
 
 				$filterValues = array();
+					foreach (Tools::getValue('categoryBox') AS $idc)
+						$filterValues['categories'][] = (int)$idc;
 
 				$sqlToInsert = 'INSERT INTO '._DB_PREFIX_.'layered_category (id_category, id_value, type, position) VALUES ';
 				foreach ($_POST['categoryBox'] AS $id_category_layered)
@@ -494,7 +685,6 @@ class BlockLayered extends Module
 						if (substr($key, 0, 17) == 'layered_selection' AND $value == 'on')
 						{							
 							$filterValues[$key] = $value;
-							
 							$n++;
 							if ($key == 'layered_selection_stock')
 								$sqlToInsert .= '('.(int)$id_category_layered.',NULL,\'quantity\','.(int)$n.'),';
@@ -513,11 +703,11 @@ class BlockLayered extends Module
 							elseif (substr($key, 0, 23) == 'layered_selection_feat_')
 								$sqlToInsert .= '('.(int)$id_category_layered.','.(int)str_replace('layered_selection_feat_', '', $key).',\'id_feature\','.(int)$n.'),';
 						}
-					$filterValues['categories'] = Tools::getValue('categoryBox');
 				}
+	
 				Db::getInstance()->Execute(rtrim($sqlToInsert, ','));
 				
-				$valuesToInsert = array('name' => pSQL(Tools::getValue('layered_tpl_name')), 'filters' => pSQL(serialize($filterValues)), 'n_categories' => (int)sizeof($_POST['categoryBox']), 'date_add' => date('Y-m-d H:i:s'));
+					$valuesToInsert = array('name' => pSQL(Tools::getValue('layered_tpl_name')), 'filters' => pSQL(serialize($filterValues)), 'n_categories' => (int)sizeof($filterValues['categories']), 'date_add' => date('Y-m-d H:i:s'));
 				if (isset($_POST['id_layered_filter']) AND $_POST['id_layered_filter'])
 					$valuesToInsert['id_layered_filter'] = (int)Tools::getValue('id_layered_filter');
 				
@@ -526,10 +716,9 @@ class BlockLayered extends Module
 				echo '<div class="conf"><img src="../img/admin/ok2.png" alt="" /> '.$this->l('Your filter').' "'.Tools::getValue('layered_tpl_name').'" '.((isset($_POST['id_layered_filter']) AND $_POST['id_layered_filter']) ? $this->l('was updated successfully.') : $this->l('was added successfully.')).'</div>';
 			}
 		}
+		}
 		elseif (Tools::isSubmit('submitLayeredSettings'))
 		{			
-			if (!sizeof($errors))
-			{
 				Configuration::updateValue('PS_LAYERED_HIDE_0_VALUES', Tools::getValue('ps_layered_hide_0_values'));
 				Configuration::updateValue('PS_LAYERED_SHOW_QTIES', Tools::getValue('ps_layered_show_qties'));
 				
@@ -538,18 +727,6 @@ class BlockLayered extends Module
 					<img src="../img/admin/ok2.png" alt="" /> '.$this->l('Settings saved successfully').'
 				</div>';
 			}
-			else
-			{
-				$html .= '
-				<div class="error">
-					<img src="../img/admin/error.png" alt="" title="" />'.$this->l('Settings not saved :').'<ul>';
-						foreach ($errors AS $error)
-							$html .= '<li>'.$error.'</li>';
-				$html .= '</ul>
-				</div>';
-			}
-				
-		}
 		elseif (isset($_GET['deleteFilterTemplate']))
 		{
 			$layeredValues = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
@@ -576,29 +753,102 @@ class BlockLayered extends Module
 		}
 		
 		$html .= '
-		<h2>'.$this->l('Layered navigation').'</h2>';
-		$html .= '
+		<div id="ajax-message-ok" class="conf ajax-message" style="display: none">
+			<img alt="" src="../img/admin/ok2.png"><span class="message"></span>
+		</div>
+		<div id="ajax-message-ko" class="error ajax-message" style="display: none">
+			<img src="../img/admin/error2.png" alt="" /><span class="message"></span>
+		</div>
+		<h2>'.$this->l('Layered navigation').'</h2>
 		<fieldset class="width4">
 			<legend><img src="../img/admin/cog.gif" alt="" />'.$this->l('Indexes and caches').'</legend>
-			<span id="indexing-warning" style="display: none; color:red; font-weight: bold">'.$this->l('Indexing are in progress. Please don\'t leave this page').'<br/><br/></span>
-		';
+			<span id="indexing-warning" style="display: none; color:red; font-weight: bold">'.$this->l('Indexing are in progress. Please don\'t leave this page').'<br/><br/></span>';
+
 		if(!Configuration::get('PS_LAYERED_INDEXED'))
 			$html .= '
 			<script type="text/javascript">
 			$(document).ready(function() {
+				$(\'#url-indexer\').click();
 				$(\'#full-index\').click();
 			});
 			</script>';
+		
+		$categoryList = array();
+		foreach(Db::getInstance()->ExecuteS('SELECT id_category FROM `'._DB_PREFIX_.'category`') as $category)
+			if($category['id_category'] != 1)
+				$categoryList[] = $category['id_category'];
+		
+
 		$html .= '
-			<a class="bold ajaxcall" style="width: 200px; text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" href="'.Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-indexer.php'.'?token='.substr(Tools::encrypt('blocklayered/index'), 0, 10).'">'.$this->l('Index all missing products').'</a>
+			<a class="bold ajaxcall" style="width: 250px; text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" href="'.Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-indexer.php'.'?token='.substr(Tools::encrypt('blocklayered/index'), 0, 10).'">'.$this->l('Index all missing prices').'</a>
 			<br />
-			<a class="bold ajaxcall" style="width: 200px; text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="full-index" href="'.Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-indexer.php'.'?token='.substr(Tools::encrypt('blocklayered/index'), 0, 10).'&full=1">'.$this->l('Re-build entire index').'</a>
+			<a class="bold ajaxcall" style="width: 250px; text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="full-index" href="'.Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-indexer.php'.'?token='.substr(Tools::encrypt('blocklayered/index'), 0, 10).'&full=1">'.$this->l('Re-build entire price index').'</a>
+			<br />
+			<a class="bold" id="url-indexer" style="width: 250px; text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="full-index" href="'.Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-url-indexer.php'.'?token='.substr(Tools::encrypt('blocklayered/index'), 0, 10).'&truncate=1">'.$this->l('Build url index').'</a>
 			<br />
 			<br />
-			'.$this->l('You can set a cron job that will re-build your index using the following URL:').'<br /><b>'.Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-indexer.php'.'?token='.substr(Tools::encrypt('blocklayered/index'), 0, 10).'&full=1</b>
+			'.$this->l('You can set a cron job that will re-build price index using the following URL:').'<br /><b>'.Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-indexer.php'.'?token='.substr(Tools::encrypt('blocklayered/index'), 0, 10).'&full=1</b>
+			<br />
+			'.$this->l('You can set a cron job that will re-build url index using the following URL:').'<br /><b>'.Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-url-indexer.php'.'?token='.substr(Tools::encrypt('blocklayered/index'), 0, 10).'&truncate=1</b>
 			<br /><br />
-			'.$this->l('A full re-index process must be done each time products are modified. A nightly rebuild is recommended.').'
+			'.$this->l('A nightly rebuild is recommended.').'
 			<script type="text/javascript">
+				$(\'#url-indexer\').click(function() {
+					if (this.cursor == undefined)
+						this.cursor = 0;
+						
+					if (this.legend == undefined)
+							this.legend = $(this).html();
+					
+					if (this.running == undefined)
+							this.running = false;
+						
+					if (this.running == true)
+						return false;
+						
+					this.running = true;
+					
+					this.categories = '.Tools::jsonEncode($categoryList).';
+					
+					$(this).html(this.legend+\' (in progress, 0/\'+this.categories.length+\')\');
+					$(\'#indexing-warning\').show();
+					
+					
+					var first = true;
+					var it = this;
+					$(this.categories).each(function(cursor, idCategory) {
+						it.cursor = cursor;
+						if(cursor == 0) {
+							var truncate = 1;
+						}
+						else {
+							var truncate = 0;
+						}
+						it.idCategory = idCategory;
+						$.ajax({
+							url: it.href.replace(\'&truncate=1\',\'\')+\'&id_category=\'+it.idCategory+\'&truncate=\'+truncate,
+							context: it,
+							dataType: \'json\',
+							async: false,
+							success: function(res) {
+								$(this).html(this.legend+\' (in progress, \'+(parseInt(it.cursor)+1)+\'/\'+it.categories.length+\')\');
+							},
+							error: function(res) {
+								alert(\'Indexation failed\');
+								$(\'#indexing-warning\').hide();
+									$(it).html(this.legend+\' (failed)\');
+								it.cursor = 0;
+							}
+						});
+					});
+					
+					
+					$(this).html(this.legend);
+					$(\'#indexing-warning\').hide();
+					this.running = false;
+					
+					return false;
+				});
 				$(\'.ajaxcall\').each(function(it, elm) {
 					$(elm).click(function() {
 						if (this.cursor == undefined)
@@ -613,14 +863,17 @@ class BlockLayered extends Module
 						if (this.running == true)
 							return false;
 						
+						$(\'.ajax-message\').hide();
+						
 						this.running = true;
 						
-						if ($(this).html() == this.legend)
+						if (typeof(this.restartAllowed) == \'undefined\' || this.restartAllowed)
 						{
 							$(this).html(this.legend+\' (in progress)\');
 							$(\'#indexing-warning\').show();
 						}
 							
+						this.restartAllowed = false;
 						
 						$.ajax({
 							url: this.href+\'&ajax=1&cursor=\'+this.cursor,
@@ -633,12 +886,25 @@ class BlockLayered extends Module
 								{
 									this.cursor = 0;
 									$(\'#indexing-warning\').hide();
-									$(this).html(this.legend+\' (finished)\');
+									$(this).html(this.legend);
+									$(\'#ajax-message-ok span\').html(\''.$this->l('Product indexation finished').'\');
+									$(\'#ajax-message-ok\').show();
 									return;
 								}
 								this.cursor = parseInt(res.cursor);
 								$(this).html(this.legend+\' (in progress, \'+res.count+\' products to index)\');
 								this.click();
+							},
+							error: function(res)
+							{
+								this.restartAllowed = true;
+								$(\'#indexing-warning\').hide();
+								$(\'#ajax-message-ko span\').html(\''.$this->l('Product indexation failed').'\');
+								$(\'#ajax-message-ko\').show();
+								$(this).html(this.legend);
+								
+								this.cursor = 0;
+								this.running = false;
 							}
 						});
 						return false;
@@ -646,9 +912,7 @@ class BlockLayered extends Module
 				});
 			</script>
 		</fieldset>
-		<br />';
-		
-		$html .= '
+		<br />
 		<fieldset class="width4">
 			<legend><img src="../img/admin/cog.gif" alt="" />'.$this->l('Existing filters templates').'</legend>';
 	
@@ -695,6 +959,7 @@ class BlockLayered extends Module
 			<legend><img src="../img/admin/cog.gif" alt="" />'.$this->l('Build your own filters template').'</legend>
 			<link rel="stylesheet" href="'._PS_CSS_DIR_.'jquery-ui-1.8.10.custom.css" />
 			<style type="text/css">
+				#error-filter-name { display: none; }
 				#layered_container_left ul, #layered_container_right ul { list-style-type: none; padding-left: 0px; }
 				.ui-effects-transfer { border: 1px solid #CCC; }
 				.ui-state-highlight { height: 1.5em; line-height: 1.2em; }
@@ -798,13 +1063,13 @@ class BlockLayered extends Module
 							$(\'#layered-step-2\').hide();
 						$(\'#layered-ajax-refresh\').css(\'background-color\', \'black\');
 						$(\'#layered-ajax-refresh\').css(\'opacity\', \'0.2\');
-						$(\'#layered-ajax-refresh\').html(\'<div style="margin: 0 auto; padding: 10px; text-align: center;"><img src="../img/admin/ajax-loader-big.gif" alt="" /><br /><p style="color: white;">'.$this->l('Loading...').'</p></div>\');
+						$(\'#layered-ajax-refresh\').html(\'<div style="margin: 0 auto; padding: 10px; text-align: center;"><img src="../img/admin/ajax-loader-big.gif" alt="" /><br /><p style="color: white;">'.$this->l('Loading...').'</p></div>\');;
 						
 						$.ajax(
 						{
 							type: \'GET\',
 							url: \''.__PS_BASE_URI__.'\' + \'modules/blocklayered/blocklayered-ajax-back.php\',
-							data: (all ? \'\' : $(\'input[name="categoryBox[]"]\').serialize()+\'&\')+(id_layered_filter ? \'id_layered_filter=\'+parseInt(id_layered_filter)+\'\' : \'\'),
+							data: \'layered_token='.substr(Tools::encrypt('blocklayered/index'), 0, 10).'&\'+(all ? \'\' : $(\'input[name="categoryBox[]"]\').serialize()+\'&\')+(id_layered_filter ? \'id_layered_filter=\'+parseInt(id_layered_filter)+\'\' : \'\'),
 							success: function(result)
 							{
 								$(\'#layered-ajax-refresh\').css(\'background-color\', \'transparent\');
@@ -824,9 +1089,15 @@ class BlockLayered extends Module
 					
 					function checkForm()
 					{
-						if ($(\'#scope_1\').attr(\'checked\') && $(\'#n_existing\').val() > 0)
+						if ($(\'#layered_tpl_name\').val() == \'\')
+						{
+							$(\'#error-filter-name\').show();
+							return false;
+						}						
+						else if ($(\'#scope_1\').attr(\'checked\') && $(\'#n_existing\').val() > 0)
 							if (!confirm(\''.addslashes($this->l('You selected -All categories-, all existing filter templates will be deleted, OK?')).'\'))
 								return false;
+
 						return true;
 					}
 
@@ -910,8 +1181,14 @@ class BlockLayered extends Module
 				</script>
 			</div>
 			<div id="layered-step-3">
+				<div id="error-filter-name" class="error">
+					<img src="../img/admin/error.png" alt="" title="" />'.$this->l('Errors:').'
+					<ul>
+						<li>'.$this->l('Filter template name required (cannot be empty)').'</li>
+					</ul>
+				</div>
 				<h2>'.$this->l('Step 3/3 - Name your template').'</h2>
-				<p>'.$this->l('Template name:').' <input type="text" id="layered_tpl_name" name="layered_tpl_name" maxlength="64" value="'.$this->l('My template').' '.date('Y-m-d').'" style="width: 200px; font-size: 11px;" /> <span style="font-size: 10px; font-style: italic;">('.$this->l('only as a reminder').'</span>)</p>
+				<p>'.$this->l('Template name:').' <input type="text" id="layered_tpl_name" onkeyup="if ($(this).val() != \'\') { $(\'#error-filter-name\').hide(); } else { $(\'#error-filter-name\').show(); }" name="layered_tpl_name" maxlength="64" value="'.$this->l('My template').' '.date('Y-m-d').'" style="width: 200px; font-size: 11px;" /> <span style="font-size: 10px; font-style: italic;">('.$this->l('only as a reminder').')</span></p>
 				<hr size="1" noshade />
 				<br />
 				<center><input type="submit" class="button" name="SubmitFilter" value="'.$this->l('Save this filter template').'" /></center>
@@ -960,9 +1237,9 @@ class BlockLayered extends Module
 		if ($id_parent == 1)
 			return;
 
-		if(strpos($_SERVER['SCRIPT_FILENAME'], 'blocklayered-ajax.php') !== false) // @TODO to be change, friendly_url auto-check box
+		if (strpos($_SERVER['SCRIPT_FILENAME'], 'blocklayered-ajax.php') === false)
 		{
-			$data = Db::getInstance()->getValue('SELECT data FROM `'._DB_PREFIX_.'layered_friendly_url` WHERE `url_key` = \''.md5($_SERVER['REQUEST_URI']).'\'');
+			$data = Db::getInstance()->getValue('SELECT data FROM `'._DB_PREFIX_.'layered_friendly_url` WHERE `url_key` = \''.md5(preg_replace('/\/(\w*)\/([0-9]+[-\w]*)/', '',$_SERVER['REQUEST_URI'])).'\'');
 			if($data !== false)
 				return unserialize($data);
 		}
@@ -994,7 +1271,7 @@ class BlockLayered extends Module
 					{
 						if (!isset($selectedFilters[$res[1]]))
 							$selectedFilters[$res[1]] = array();
-						$selectedFilters[$res[1]][$value] = (int)$value;
+						$selectedFilters[$res[1]][(int)$value] = $id_key.'_'.(int)$value;
 					}
 					elseif ($res[1] == 'weight')
 						$selectedFilters[$res[1]] = $tmpTab;
@@ -1002,7 +1279,6 @@ class BlockLayered extends Module
 						$selectedFilters[$res[1]] = $tmpTab;
 				}
 			}
-
 		return $selectedFilters;
 	}
 
@@ -1018,7 +1294,7 @@ class BlockLayered extends Module
 		if ($id_parent == 1)
 			return;
 
-		$queryFilters = '';
+		$queryFilters = ' AND p.active = 1';
 		
 		$parent = new Category((int)$id_parent);
 		if (!sizeof($selectedFilters['category']))
@@ -1037,21 +1313,42 @@ class BlockLayered extends Module
 			switch ($key)
 			{
 				case 'id_feature':
-					$queryFilters .= ' AND p.id_product IN (SELECT id_product FROM '._DB_PREFIX_.'feature_product fp WHERE ';
+					$subQueries = array();
 					foreach ($filterValues AS $filterValue)
-						$queryFilters .= 'fp.`id_feature_value` = '.(int)$filterValue.' OR ';
-					$queryFilters = rtrim($queryFilters, 'OR ').')';
+					{
+						$filterValueArray = explode('_',$filterValue);
+						if(!isset($subQueries[$filterValueArray[0]]))
+							$subQueries[$filterValueArray[0]] = array();
+						$subQueries[$filterValueArray[0]][] = 'fp.`id_feature_value` = '.(int)$filterValueArray[1];
+						//$queryFilters .= 'pac.`id_attribute` = '.(int)$filterValue.' OR ';
+					}
+					foreach($subQueries as $subQuery)
+					{
+						$queryFilters .= ' AND p.id_product IN (SELECT `id_product` FROM `'._DB_PREFIX_.'feature_product` fp WHERE ';
+						$queryFilters .= implode(' OR ', $subQuery).') ';
+					}
 				break;
 
 				case 'id_attribute_group':
+					$subQueries = array();
+					
+					
+					foreach ($filterValues AS $filterValue)
+					{
+						$filterValueArray = explode('_',$filterValue);
+						if(!isset($subQuery[$filterValueArray[0]]))
+							$subQueries[$filterValueArray[0]] = array();
+						$subQueries[$filterValueArray[0]][] = 'pac.`id_attribute` = '.(int)$filterValueArray[1];
+						//$queryFilters .= 'pac.`id_attribute` = '.(int)$filterValue.' OR ';
+					}
+					foreach($subQueries as $subQuery)
+					{
 					$queryFilters .= ' AND p.id_product IN (SELECT pa.`id_product`
 										FROM `'._DB_PREFIX_.'product_attribute_combination` pac
 										LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa
 										ON (pa.`id_product_attribute` = pac.`id_product_attribute`) WHERE ';
-										
-					foreach ($filterValues AS $filterValue)
-						$queryFilters .= 'pac.`id_attribute` = '.(int)$filterValue.' OR ';
-					$queryFilters = rtrim($queryFilters, 'OR ').')';
+						$queryFilters .= implode(' OR ', $subQuery).') ';
+					}
 				break;
 
 				case 'category':
@@ -1124,13 +1421,13 @@ class BlockLayered extends Module
 		SELECT p.`id_product` id_product
 		FROM `'._DB_PREFIX_.'product` p
 		'.$priceFilterQueryOut.'
-		WHERE 1 '.$queryFilters);
+		WHERE 1 '.$queryFilters.' GROUP BY id_product');
 		
 		$allProductsIn = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
 		SELECT p.`id_product` id_product
 		FROM `'._DB_PREFIX_.'product` p
 		'.$priceFilterQueryIn.'
-		WHERE 1 '.$queryFilters);
+		WHERE 1 '.$queryFilters.' GROUP BY id_product');
 
 		$productIdList = array();
 		
@@ -1163,379 +1460,12 @@ class BlockLayered extends Module
 			LEFT JOIN '._DB_PREFIX_.'image_lang il ON (i.id_image = il.id_image AND il.id_lang = '.(int)($cookie->id_lang).')
 			LEFT JOIN '._DB_PREFIX_.'manufacturer m ON (m.id_manufacturer = p.id_manufacturer)
 			WHERE p.`active` = 1 AND c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.' AND pl.id_lang = '.(int)$cookie->id_lang.' AND p.id_product IN ('.implode(',', $productIdList).')'
-			.' ORDER BY '.Tools::getProductsOrder('by', Tools::getValue('orderby'), true).' '.Tools::getProductsOrder('way', Tools::getValue('orderway')).
+			.' GROUP BY p.id_product ORDER BY '.Tools::getProductsOrder('by', Tools::getValue('orderby'), true).' '.Tools::getProductsOrder('way', Tools::getValue('orderway')).
 			' LIMIT '.(((int)Tools::getValue('p', 1) - 1) * $n.','.$n));
 		}
-		
 		return $this->products;
 	}
-	public function generateFiltersBlockOld($selectedFilters = array())
-	{
-		global $smarty, $link, $cookie;
 
-		/* If the current category isn't defined of if it's homepage, we have nothing to display */
-		$id_parent = (int)Tools::getValue('id_category', Tools::getValue('id_category_layered', 1));
-		if ($id_parent == 1)
-			return;
-
-		/* First we need to get all subcategories of current category */
-		$category = new Category((int)$id_parent);
-
-		$groups = FrontController::getCurrentCustomerGroups();
-
-		$subCategories = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-		SELECT c.id_category, c.id_parent, cl.name
-		FROM '._DB_PREFIX_.'category c
-		LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category)
-		LEFT JOIN '._DB_PREFIX_.'category_group cg ON (cg.id_category = c.id_category)
-		WHERE c.nleft > '.(int)$category->nleft.' and c.nright <= '.(int)$category->nright.' AND c.active = 1 AND c.id_parent = '.(int)$category->id.' AND cl.id_lang = '.(int)$cookie->id_lang.'
-		AND cg.id_group '.pSQL(sizeof($groups) ? 'IN ('.implode(',', $groups).')' : '= 1').'
-		GROUP BY c.id_category
-		ORDER BY c.position ASC');
-
-		$whereC = ' cp.`id_category` = '.(int)$id_parent.' OR ';
-		foreach ($subCategories AS $subcategory)
-				$whereC .= ' cp.`id_category` = '.(int)$subcategory['id_category'].' OR ';
-
-		$whereC = rtrim($whereC, 'OR ').')';
-		$productsSQL = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-		SELECT p.`id_product`, p.`condition`, p.`id_manufacturer`, p.`quantity`, p.`weight`, psi.price_max, psi.price_min,
-		(SELECT GROUP_CONCAT(`id_category`) FROM `'._DB_PREFIX_.'category_product` cp WHERE cp.`id_product` = p.`id_product`) ids_cat,
-			(SELECT GROUP_CONCAT(`id_feature_value`) FROM `'._DB_PREFIX_.'feature_product` fp WHERE fp.`id_product` = p.`id_product`) ids_feat,
-			(SELECT GROUP_CONCAT(DISTINCT(pac.`id_attribute`)) 
-				FROM `'._DB_PREFIX_.'product_attribute_combination` pac
-				LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (pa.`id_product_attribute` = pac.`id_product_attribute`) 
-				WHERE pa.`id_product` = p.`id_product`) ids_attr
-		FROM '._DB_PREFIX_.'product p 
-		LEFT JOIN  `'._DB_PREFIX_.'price_static_index` psi
-			ON psi.`id_product` = p.`id_product` AND psi.`id_currency` = '.(int)Currency::getCurrent()->id.'
-		WHERE p.`active` = 1 AND p.`id_product` IN (SELECT id_product FROM `'._DB_PREFIX_.'category_product` cp WHERE'.$whereC, false);
-		
-		$products = array();
-		$db = Db::getInstance(_PS_USE_SQL_SLAVE_);
-		$weight = array();
-		$price = array();
-		$productIdList = array();
-		$productList = array();
-		while ($product = $db->nextRow($productsSQL))
-		{
-			$row = array();
-			foreach ($product AS $key => $value)
-			{
-				if ($key == 'ids_feat')
-					$row['f'] = explode(',', $value);
-				if ($key == 'ids_attr')
-					$row['a'] = explode(',', $value);
-				if ($key == 'ids_cat')
-					$row['c'] = explode(',', $value);
-				if ($key == 'weight')
-					$weight[] = $value;
-			}
-
-			$row['id_manufacturer'] = (int)$product['id_manufacturer'];
-			$row['quantity'] = (bool)$product['quantity'];
-			$row['condition'] = $product['condition'];
-			$row['weight'] = $product['weight'];
-			$row['price_min'] = $product['price_min'];
-			$row['price_max'] = $product['price_max'];
-			$price[] = $product['price_min'];
-			$price[] = $product['price_max'];
-			
-			$products[(int)$product['id_product']] = $row;
-		}
-
-		/* Get the filters for the current category */
-		$filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$id_parent.' ORDER BY position ASC');
-		$filterBlocks = $f = $a = array();
-		
-		foreach ($filters AS $filter)
-		{
-			$filterBlocks[(int)$filter['position']]['type_lite'] = $filter['type'];
-			$filterBlocks[(int)$filter['position']]['type'] = $filter['type'].($filter['id_value'] ? '_'.(int)$filter['id_value'] : '');
-			$filterBlocks[(int)$filter['position']]['id_key'] = (int)$filter['id_value'];
-			switch ($filter['type'])
-			{
-				case 'id_feature':
-					$f[] = (int)$filter['id_value'];
-					
-					$filterBlocks[(int)$filter['position']]['SQLvalues'] = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-					SELECT fvl.id_feature_value, fvl.value
-					FROM '._DB_PREFIX_.'feature_value fv
-					LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.id_feature_value = fv.id_feature_value)
-					WHERE (fv.custom IS NULL OR fv.custom = 0) AND fv.id_feature = '.(int)$filterBlocks[(int)$filter['position']]['id_key'].' AND fvl.id_lang = '.(int)$cookie->id_lang);
-					break;
-
-				case 'id_attribute_group':
-					$a[] = (int)$filter['id_value'];
-					
-					$filterBlocks[(int)$filter['position']]['SQLvalues'] = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-					SELECT al.id_attribute, al.name, a.color
-					FROM '._DB_PREFIX_.'attribute a
-					LEFT JOIN '._DB_PREFIX_.'attribute_lang al ON (al.id_attribute = a.id_attribute)
-					WHERE a.id_attribute_group = '.(int)$filterBlocks[(int)$filter['position']]['id_key'].' AND al.id_lang = '.(int)$cookie->id_lang);
-					break;
-			}
-		}
-
-		/* Get the feature block names & values */
-		if (sizeof($f))
-		{
-			$fNames = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-			SELECT id_feature, name
-			FROM '._DB_PREFIX_.'feature_lang
-			WHERE id_lang = '.(int)$cookie->id_lang.' AND id_feature IN ('.implode(',', $f).')');
-			$fNameByID = array();
-			foreach ($fNames AS $fName)
-				$fNameByID[(int)$fName['id_feature']] = $fName['name'];
-		}
-
-		/* Get the attribute block names & values */
-		if (sizeof($a))
-		{
-			$aNames = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-			SELECT ag.id_attribute_group, agl.public_name, ag.is_color_group
-			FROM '._DB_PREFIX_.'attribute_group ag
-			LEFT JOIN '._DB_PREFIX_.'attribute_group_lang agl ON (agl.id_attribute_group = ag.id_attribute_group)
-			WHERE agl.id_lang = '.(int)$cookie->id_lang.' AND ag.id_attribute_group IN ('.implode(',', $a).')');
-
-			$aNameByID = $colorGroups = array();
-			foreach ($aNames AS $aName)
-			{
-				$aNameByID[(int)$aName['id_attribute_group']] = $aName['public_name'];
-				if ($aName['is_color_group'])
-					$colorGroups[(int)$aName['id_attribute_group']] = true;
-			}
-		}
-
-		foreach ($filterBlocks AS &$filterBlock)
-		{
-			if ($filterBlock['type_lite'] == 'category')
-			{
-				$filterBlock['name'] = $this->l('Categories');
-
-				$c = array();
-				foreach ($subCategories AS $subCat)
-				{
-					$c[] = (int)$subCat['id_category'];
-					$filterBlock['values'][(int)$subCat['id_category']]['name'] = $subCat['name'];
-					
-					//init the number of product in this category
-					if (!isset($filterBlock['values'][(int)$subCat['id_category']]['nbr']))
-						$filterBlock['values'][(int)$subCat['id_category']]['nbr'] = 0;
-
-					//check if the category is selected and set to true
-					if (isset($selectedFilters['category']) AND in_array($subCat['id_category'], $selectedFilters['category']))
-						$filterBlock['values'][(int)$subCat['id_category']]['checked'] = true;
-				}
-
-				$productCat = $this->filterProducts($products, $selectedFilters, 'category');
-				
-				// Count number of products in each category
-				foreach ($c AS $idSubCategory)
-					foreach ($productCat AS $product)
-						if (in_array($idSubCategory, $product['c']))
-							$filterBlock['values'][(int)$idSubCategory]['nbr']++;
-							
-				if (Configuration::get('PS_LAYERED_HIDE_0_VALUES') AND !$filterBlock['values'][(int)$idSubCategory]['nbr'])
-					unset($filterBlock['values'][(int)$subCat['id_category']]);
-			}
-			elseif ($filterBlock['type_lite'] == 'id_feature')
-			{
-				$filterBlock['name'] = $fNameByID[(int)$filterBlock['id_key']];
-				$filterBlock['values'] = array();
-
-				$productFeat = $this->filterProducts($products, $selectedFilters, 'id_feature_'.(int)$filterBlock['id_key']);
-
-				foreach ($filterBlock['SQLvalues'] AS $value)
-				{	
-					foreach ($productFeat AS $product)
-					{
-						if (Configuration::get('PS_LAYERED_HIDE_0_VALUES') AND !in_array($value['id_feature_value'], $product['f']))
-							continue;
-						else
-						{
-							$filterBlock['values'][(int)$value['id_feature_value']]['name'] = $value['value'];
-							if (!isset($filterBlock['values'][(int)$value['id_feature_value']]['nbr']))
-								$filterBlock['values'][(int)$value['id_feature_value']]['nbr'] = 0;
-							if (in_array($value['id_feature_value'], $product['f']))
-								$filterBlock['values'][(int)$value['id_feature_value']]['nbr']++;
-						}
-						if (in_array($value['id_feature_value'], $product['f']) AND !isset($filterBlock['values'][(int)$value['id_feature_value']]))
-						{
-							$filterBlock['values'][(int)$value['id_feature_value']]['name'] = $value['value'];
-							$filterBlock['values'][(int)$value['id_feature_value']]['nbr'] = 0;
-						}
-					}
-					if (isset($selectedFilters['id_feature_'.(int)$filterBlock['id_key']]) AND in_array((int)$value['id_feature_value'].'_'.(int)$filterBlock['id_key'], $selectedFilters['id_feature_'.(int)$filterBlock['id_key']]))
-						$filterBlock['values'][(int)$value['id_feature_value']]['checked'] = true;
-				}
-
-				unset($filterBlock['SQLvalues']);
-			}
-			elseif ($filterBlock['type_lite'] == 'id_attribute_group')
-			{
-				$filterBlock['name'] = $aNameByID[(int)$filterBlock['id_key']];
-				$filterBlock['is_color_group'] = isset($colorGroups[(int)$filterBlock['id_key']]);
-				$filterBlock['values'] = array();
-				
-				$productsAttr = $this->filterProducts($products, $selectedFilters, 'id_attribute_group_'.(int)$filterBlock['id_key']);
-				
-				foreach ($filterBlock['SQLvalues'] AS $value)
-				{
-					foreach ($productsAttr AS $product)
-					{
-						if (in_array($value['id_attribute'], $product['a']))
-						{
-							$filterBlock['values'][(int)$value['id_attribute']]['name'] = $value['name'];
-							$filterBlock['values'][(int)$value['id_attribute']]['color'] = $value['color'];
-							if (!isset($filterBlock['values'][(int)$value['id_attribute']]['nbr']))
-								$filterBlock['values'][(int)$value['id_attribute']]['nbr'] = 0;
-							$filterBlock['values'][(int)$value['id_attribute']]['nbr']++;
-						}
-						if (isset($product['a'.$value['id_attribute']]) AND !isset($filterBlock['values'][(int)$value['id_attribute']]))
-						{
-							$filterBlock['values'][(int)$value['id_attribute']]['name'] = $value['name'];
-							$filterBlock['values'][(int)$value['id_attribute']]['nbr'] = 0;
-						}
-					}
-					if (isset($selectedFilters['id_attribute_group_'.(int)$filterBlock['id_key']]) AND in_array((int)$value['id_attribute'].'_'.(int)$filterBlock['id_key'], $selectedFilters['id_attribute_group_'.(int)$filterBlock['id_key']]))
-						$filterBlock['values'][(int)$value['id_attribute']]['checked'] = true;
-				}
-				unset($filterBlock['SQLvalues']);
-			}
-			elseif ($filterBlock['type_lite'] == 'condition')
-			{
-				$filterBlock['name'] = $this->l('Condition');
-				$filterBlock['values'] = array(
-				'new' => array('name' => $this->l('New'), 'nbr' => 0), 
-				'used' => array('name' => $this->l('Used'), 'nbr' => 0), 
-				'refurbished' => array('name' => $this->l('Refurbished'), 'nbr' => 0));
-
-				$productCond = $this->filterProducts($products, $selectedFilters, 'condition');
-
-				foreach ($filterBlock['values'] AS $conditionKey => &$condition)
-				{
-					foreach ($productCond AS $product)
-						if ($product['condition'] == $conditionKey)
-							$condition['nbr']++;
-					if (isset($selectedFilters['condition']) AND in_array($conditionKey, $selectedFilters['condition']))
-						$condition['checked'] = true;
-				}
-				
-				if (Configuration::get('PS_LAYERED_HIDE_0_VALUES'))
-				{
-					foreach ($filterBlock['values'] AS $conditionKey2 => $condition2)
-						if (!$condition2['nbr'])
-							unset($filterBlock['values'][$conditionKey2]);
-				}
-			}
-			elseif ($filterBlock['type_lite'] == 'quantity')
-			{
-				$filterBlock['name'] = $this->l('Availability');
-				$filterBlock['values'] = array(
-				'1' => array('name' => $this->l('In stock'), 'nbr' => 0),
-				'0' => array('name' => $this->l('Not available'), 'nbr' => 0));
-
-				$productQuant = $this->filterProducts($products, $selectedFilters, 'quantity');
-				
-				foreach ($filterBlock['values'] AS $quantKey => &$quantity)
-				{
-					foreach ($productQuant AS $product)
-						if ($product['quantity'] == $quantKey)
-							$quantity['nbr']++;
-					if (isset($selectedFilters['quantity']) AND in_array($quantKey, $selectedFilters['quantity']))
-						$quantity['checked'] = true;
-				}
-				
-				if (Configuration::get('PS_LAYERED_HIDE_0_VALUES'))
-				{
-					foreach ($filterBlock['values'] AS $quantKey2 => $quantity2)
-						if (!$quantity2['nbr'])
-							unset($filterBlock['values'][$quantKey2]);
-				}
-			}
-			elseif ($filterBlock['type_lite'] == 'manufacturer')
-			{
-				$filterBlock['name'] = $this->l('Manufacturer');
-
-				$man = array();
-				$productKeys = array_keys($products);
-				if (!empty($productKeys))
-					$man = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-					SELECT DISTINCT(p.id_manufacturer), m.name
-					FROM '._DB_PREFIX_.'product p			
-					LEFT JOIN '._DB_PREFIX_.'manufacturer m ON (m.id_manufacturer = p.id_manufacturer)
-					WHERE p.id_product IN ('.implode(',', $productKeys).') AND p.id_manufacturer != 0');
-
-				$productsManuf = $this->filterProducts($products, $selectedFilters, 'manufacturer');
-
-				foreach ($man AS $manufacturer)
-				{
-					$filterBlock['values'][(int)$manufacturer['id_manufacturer']]['name'] = $manufacturer['name'];
-					if (!isset($filterBlock['values'][(int)$manufacturer['id_manufacturer']]['nbr']))
-						$filterBlock['values'][(int)$manufacturer['id_manufacturer']]['nbr'] = 0;
-					foreach ($productsManuf AS $product)
-						if ($product['id_manufacturer'] == $manufacturer['id_manufacturer'])
-							$filterBlock['values'][(int)$manufacturer['id_manufacturer']]['nbr']++;
-					if (isset($selectedFilters['manufacturer']) AND in_array($manufacturer['id_manufacturer'], $selectedFilters['manufacturer']))
-						$filterBlock['values'][(int)$manufacturer['id_manufacturer']]['checked'] = true;
-				}
-			}
-			elseif ($filterBlock['type_lite'] == 'weight')
-			{
-				if (!empty($weight) AND max($weight) != min($weight))
-				{
-					$filterBlock['name'] = $this->l('Weight');
-					$filterBlock['slider'] = true;
-					$filterBlock['max'] = max($weight);
-					$filterBlock['min'] = min($weight);
-					if (isset($selectedFilters['weight']))
-						$filterBlock['values'] = array($selectedFilters['weight'][0], $selectedFilters['weight'][1]);
-					else
-						$filterBlock['values'] = array(min($weight), max($weight));
-					$filterBlock['unit'] = Configuration::get('PS_WEIGHT_UNIT');
-				}
-				else
-					unset($selectedFilters['weight']);
-			}
-			elseif ($filterBlock['type_lite'] == 'price')
-			{
-				if (!empty($price) AND max($price) != min($price))
-				{
-					$filterBlock['name'] = $this->l('Price');
-					$filterBlock['slider'] = true;
-					$filterBlock['max'] = round(max($price));
-					$filterBlock['min'] = round(min($price));
-					if (isset($selectedFilters['price']))
-						$filterBlock['values'] = array($selectedFilters['price'][0], $selectedFilters['price'][1]);
-					else
-						$filterBlock['values'] = array(round(min($price)), ceil(max($price)));
-					$filterBlock['unit'] = Currency::getCurrent()->sign;
-				}
-				else
-					unset($selectedFilters['price']);
-			}
-		}
-
-		$nFilters = 0;
-		foreach ($selectedFilters AS $filters)
-			$nFilters += sizeof($filters);
-		
-		$params = '?';
-		foreach ($_GET AS $key => $val)
-			$params .= $key.'='.$val.'&';
-		
-		$smarty->assign(array(
-		'layered_show_qties' => (int)Configuration::get('PS_LAYERED_SHOW_QTIES'),
-		'id_category_layered' => (int)$id_parent,
-		'selected_filters' => $selectedFilters,
-		'n_filters' => (int)$nFilters,
-		'nbr_filterBlocks' => sizeof($filterBlocks),
-		'filters' => $filterBlocks));
-		return $this->display(__FILE__, 'blocklayered.tpl');
-	}
-	
-	
 	public function generateFiltersBlockNew($selectedFilters = array())
 	{
 		global $cookie, $smarty;
@@ -1544,8 +1474,11 @@ class BlockLayered extends Module
 		if ($id_parent == 1)
 			return;
 			
+		$parent = new Category((int)$id_parent);
+		
+			
 		/* Get the filters for the current category */
-		$filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$id_parent.' ORDER BY position ASC');
+		$filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$id_parent.' GROUP BY `type`, id_value ORDER BY position ASC');
 		// Remove all empty selected filters
 		foreach ($selectedFilters as $key => $value)
 			switch($key)
@@ -1568,7 +1501,10 @@ class BlockLayered extends Module
 			switch($filter['type'])
 			{
 				// conditions + quantities + weight + price
-				case 'price': case 'weight': case 'condition': case 'quantity':
+				case 'price':
+				case 'weight':
+				case 'condition':
+				case 'quantity':
 					$sqlQuery['select'] = '
 					SELECT p.`id_product`, p.`condition`, p.`id_manufacturer`, p.`quantity`, p.`weight`,
 					(SELECT GROUP_CONCAT(`id_category`) FROM `'._DB_PREFIX_.'category_product` cp WHERE cp.`id_product` = p.`id_product`) ids_cat,
@@ -1581,29 +1517,32 @@ class BlockLayered extends Module
 					FROM '._DB_PREFIX_.'product p ';
 					$sqlQuery['join'] = '
 					INNER JOIN '._DB_PREFIX_.'category_product cp ON (cp.id_product = p.id_product)
-					INNER JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category AND c.id_category = '.(int)$id_parent.') ';
+					INNER JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category AND c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.') ';
 					$sqlQuery['where'] = 'WHERE p.`active` = 1 ';
 					break;
+
 				case 'manufacturer':
 					$sqlQuery['select'] = 'SELECT m.name, count(p.id_product) nbr, m.id_manufacturer ';
 					$sqlQuery['from'] = '
 					FROM `'._DB_PREFIX_.'category_product` cp
+					INNER JOIN  `'._DB_PREFIX_.'category` c ON (c.id_category = cp.id_category)
 					INNER JOIN '._DB_PREFIX_.'product p ON (p.id_product = cp.id_product AND p.active = 1)
 					INNER JOIN '._DB_PREFIX_.'manufacturer m ON (m.id_manufacturer = p.id_manufacturer) ';
 					$sqlQuery['where'] = '
-					WHERE cp.`id_category` = '.(int)$id_parent.' ';
+					WHERE c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.' ';
 					$sqlQuery['group'] = ' GROUP BY p.id_manufacturer ';
 					break;
+
 				case 'id_attribute_group':// attribute group
 					$sqlQuery['select'] = '
 					SELECT COUNT(tmp.id_attribute) nbr, tmp.id_attribute_group, tmp.color, tmp.attribute_name name, agl.public_name attributeName,
-					tmp.id_attribute id_attribute, a.is_color_group FROM (SELECT p.id_product, pac.id_attribute, a.color, al.name as attribute_name, a.id_attribute_group';
+					tmp.id_attribute id_attribute, a.is_color_group FROM (SELECT p.id_product, pac.id_attribute, a.color, al.name attribute_name, a.id_attribute_group';
 					$sqlQuery['from'] = '
 					FROM '._DB_PREFIX_.'product_attribute_combination pac
 					LEFT JOIN '._DB_PREFIX_.'product_attribute pa ON (pa.id_product_attribute = pac.id_product_attribute)
 					LEFT JOIN '._DB_PREFIX_.'product p ON (pa.id_product = p.id_product)
 					LEFT JOIN '._DB_PREFIX_.'category_product cp ON (cp.id_product = pa.id_product)
-					INNER JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category AND c.id_category = '.(int)$id_parent.')
+					INNER JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category AND c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.')
 					LEFT JOIN '._DB_PREFIX_.'attribute a ON (a.id_attribute = pac.id_attribute)
 					LEFT JOIN '._DB_PREFIX_.'attribute_lang al ON (al.id_attribute = pac.id_attribute AND al.id_lang = '.(int)$cookie->id_lang.') ';
 					$sqlQuery['group'] = '
@@ -1613,13 +1552,15 @@ class BlockLayered extends Module
 					LEFT JOIN '._DB_PREFIX_.'attribute_group a ON (a.id_attribute_group = al.id_attribute_group)
 					LEFT JOIN '._DB_PREFIX_.'attribute_group_lang agl ON (a.id_attribute_group = agl.id_attribute_group AND agl.id_lang = '.(int)$cookie->id_lang.')
 					GROUP BY tmp.id_attribute
-					ORDER BY id_attribute_group';
+					ORDER BY id_attribute_group, id_attribute';
 					break;
+
 				case 'id_feature':
-					$sqlQuery['select'] = 'SELECT fl.name, fp.id_feature, fv.id_feature_value, fvl.value, count(fv.id_feature_value) nbr ';
+					$sqlQuery['select'] = 'SELECT fl.name feature_name, fp.id_feature, fv.id_feature_value, fvl.value, count(fv.id_feature_value) nbr ';
 					$sqlQuery['from'] = '
 					FROM '._DB_PREFIX_.'feature_product fp
-					LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_category` = '.(int)$id_parent.' AND cp.`id_product` = fp.`id_product`)
+					LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = fp.`id_product`)
+					INNER JOIN `'._DB_PREFIX_.'category` c ON (c.id_category = cp.id_category AND c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.')
 					INNER JOIN '._DB_PREFIX_.'product p ON (p.id_product = cp.id_product AND p.active = 1)
 					LEFT JOIN '._DB_PREFIX_.'feature_lang fl ON (fl.id_feature = fp.id_feature AND fl.id_lang = '.(int)$cookie->id_lang.')
 					INNER JOIN '._DB_PREFIX_.'feature_value fv ON (fv.id_feature_value = fp.id_feature_value AND (fv.custom IS NULL OR fv.custom = 0))
@@ -1627,6 +1568,7 @@ class BlockLayered extends Module
 					$sqlQuery['where'] = 'WHERE p.`active` = 1 ';
 					$sqlQuery['group'] = 'GROUP BY fv.id_feature_value ';
 					break;
+
 				case 'category':
 					$sqlQuery['select'] = '
 					SELECT c.id_category, c.id_parent, cl.name, (SELECT count(*) # ';
@@ -1677,7 +1619,6 @@ class BlockLayered extends Module
 						$priceArray = array('type_lite' => 'price', 'type' => 'price', 'id_key' => 0, 'name' => $this->l('Price'),
 						'slider' => true, 'max' => '0', 'min' => null, 'values' => array ('1' => 0), 'unit' => Currency::getCurrent()->sign);
 					if (isset($products) AND $products)
-					{
 						foreach ($products as $product)
 						{
 							if (is_null($priceArray['min']))
@@ -1697,7 +1638,6 @@ class BlockLayered extends Module
 								$priceArray['values'][1] = $product['price_max'];
 							}
 						}
-					}
 							if (isset($selectedFilters['price']) AND isset($selectedFilters['price'][0])
 					AND isset($selectedFilters['price'][1]))
 							{
@@ -1711,7 +1651,6 @@ class BlockLayered extends Module
 						$weightArray = array('type_lite' => 'weight', 'type' => 'weight', 'id_key' => 0, 'name' => $this->l('Weight'), 'slider' => true,
 						'max' => '0', 'min' => null, 'values' => array ('1' => 0), 'unit' => Configuration::get('PS_WEIGHT_UNIT'));
 					if (isset($products) AND $products)
-					{
 						foreach ($products as $product)
 						{
 							if (is_null($weightArray['min']))
@@ -1731,7 +1670,6 @@ class BlockLayered extends Module
 								$weightArray['values'][1] = $product['weight'];
 							}
 						}
-					}
 							if (isset($selectedFilters['weight']) AND isset($selectedFilters['weight'][0])
 					AND isset($selectedFilters['weight'][1]))
 							{
@@ -1744,6 +1682,8 @@ class BlockLayered extends Module
 					case 'condition':
 						$conditionArray =  array('new' => array('name' => $this->l('New'), 'nbr' => 0), 
 						'used' => array('name' => $this->l('Used'), 'nbr' => 0), 'refurbished' => array('name' => $this->l('Refurbished'), 'nbr' => 0));
+					if (isset($products) AND $products)
+						foreach ($products as $product)
 						if (isset($selectedFilters['condition']) AND in_array($product['condition'], $selectedFilters['condition']))
 							$conditionArray[$product['condition']]['checked'] = true;
 						foreach ($conditionArray as $key => $condition)
@@ -1752,8 +1692,8 @@ class BlockLayered extends Module
 					if (isset($products) AND $products)
 						foreach ($products as $product)
 							$conditionArray[$product['condition']]['nbr']++;
-					break;
 						$filterBlocks[] = array('type_lite' => 'condition', 'type' => 'condition', 'id_key' => 0, 'name' => $this->l('Condition'), 'values' => $conditionArray);
+					break;
 
 					case 'quantity':
 						$quantityArray = array (0 => array('name' => $this->l('Not available'), 'nbr' => 0), 1 => array('name' => $this->l('In stock'), 'nbr' => 0));
@@ -1787,7 +1727,7 @@ class BlockLayered extends Module
 							if (!isset($attributesArray[$attributes['id_attribute_group']]))
 							{
 								$attributesArray[$attributes['id_attribute_group']] = array ('type_lite' => 'id_attribute_group',
-								'type' => 'id_attribute_group_'.(int)$attributes['id_attribute_group'], 'id_key' => (int)$attributes['id_attribute_group'],
+								'type' => 'id_attribute_group', 'id_key' => (int)$attributes['id_attribute_group'],
 								'name' =>  $attributes['attributeName'], 'is_color_group' => (bool)$attributes['is_color_group'], 'values' => array());
 							}
 							$attributesArray[$attributes['id_attribute_group']]['values'][$attributes['id_attribute']] = array(
@@ -1805,11 +1745,10 @@ class BlockLayered extends Module
 						foreach ($products as $feature)
 						{
 							if (!isset($featureArray[$feature['id_feature']]))
-								$featureArray[$feature['id_feature']] = array('type_lite' => 'id_feature', 'type' => 'id_feature_'.(int)$feature['id_feature'],
-								'id_key' => (int)$feature['id_feature'], 'values' => array(), 'name' => $feature['name']);
-								
+								$featureArray[$feature['id_feature']] = array('type_lite' => 'id_feature', 'type' => 'id_feature',
+								'id_key' => (int)$feature['id_feature'], 'values' => array(), 'name' => $feature['feature_name']);
 							$featureArray[$feature['id_feature']]['values'][$feature['id_feature_value']] = array('nbr' => (int)$feature['nbr'], 'name' => $feature['value']);
-							if (isset($selectedFilters['id_feature']) AND in_array($feature['id_feature_value'], $selectedFilters['id_feature']))
+							if (isset($selectedFilters['id_feature'][$feature['id_feature_value']]))
 								$featureArray[$feature['id_feature']]['values'][$feature['id_feature_value']]['checked'] = true;
 						}
 						$filterBlocks = array_merge($filterBlocks, $featureArray);
@@ -1819,68 +1758,78 @@ class BlockLayered extends Module
 					case 'category':
 						$tmpArray = array();
 					if (isset($products) AND $products)
+					{
 						foreach ($products as $category)
-							$tmpArray[] = array('name' => $category['name'], 'nbr' => (int)$category['count_products']);
+						{
+							$tmpArray[$category['id_category']] = array('name' => $category['name'], 'nbr' => (int)$category['count_products']);
+							if (isset($selectedFilters['category']) AND in_array($category['id_category'], $selectedFilters['category']))
+								$tmpArray[$category['id_category']]['checked'] = true;
+						}
 						$filterBlocks[] = array ('type_lite' => 'category', 'type' => 'category', 'id_key' => 0, 'name' => $this->l('Categories'), 'values' => $tmpArray);
+					}
 						break;
 				
 				}
 		}
 				
 		//generate SEO link
-		
-		$paramSelected = '';
 		$optionCheckedArray = array();
 		$paramGroupSelectedArray = array();
 		$link = new Link();
-		$linkBase = $link->getCategoryLink($id_parent,Category::getLinkRewrite($id_parent, (int)($cookie->id_lang),(int)($cookie->id_lang) ), (int)($cookie->id_lang));
+		$linkBase = $link->getCategoryLink($id_parent,Category::getLinkRewrite($id_parent, (int)($cookie->id_lang)), (int)($cookie->id_lang));
+		$filterBlockList = array();
 			
-		//get filters checked by group
 		foreach ($filterBlocks as $typeFilter)
 		{
 			$paramGroupSelected = '';
 			foreach ($typeFilter['values'] as $key => $value)
 			{
-				if(is_array($value) AND array_key_exists('checked',$value )){
+				if (is_array($value) AND array_key_exists('checked', $value ))
+				{
 					$paramGroupSelected .= '-'.Tools::link_rewrite($value['name']);
 					$paramGroupSelectedArray [Tools::link_rewrite($typeFilter['name'])][]  = Tools::link_rewrite($value['name']);
-				}else 
+				}
+				else 
 					$paramGroupSelectedArray [Tools::link_rewrite($typeFilter['name'])][] = array();
 			}
 			if(!empty($paramGroupSelected))
-			{
-				$paramSelected .= '/'.Tools::link_rewrite($typeFilter['name']).$paramGroupSelected;
 				$optionCheckedArray[Tools::link_rewrite($typeFilter['name'])] = $paramGroupSelected;
+			
+			$filterBlockList[] = Tools::link_rewrite($typeFilter['name']);
 			}
-		}
 		
 		$blackList = array('weight','price');
+		
 		foreach ($filterBlocks as &$typeFilter)
-		{	
-			if(count($typeFilter) > 0 AND !in_array($typeFilter['type'], $blackList))
-			{	
+			if (count($typeFilter) > 0 AND !in_array($typeFilter['type'], $blackList)){
 				foreach ($typeFilter['values'] as $key => $values)
 				{
 					$optionCheckedCloneArray = $optionCheckedArray;
 					//if not filters checked, add parameter
 					if(!in_array(Tools::link_rewrite($values['name']), $paramGroupSelectedArray[Tools::link_rewrite($typeFilter['name'])]))
 					{
-						//update parameter filter checked before
-						if(array_key_exists(Tools::link_rewrite($typeFilter['name']), $optionCheckedArray))
-							$optionCheckedCloneArray[Tools::link_rewrite($typeFilter['name'])] = $optionCheckedCloneArray[Tools::link_rewrite($typeFilter['name'])].'-'.Tools::link_rewrite($values['name']);
-						else 
+						//filter checked
 							$optionCheckedCloneArray[Tools::link_rewrite($typeFilter['name'])] =  '-'.Tools::link_rewrite($values['name']);
 					}
-					$parameters = '';
-					foreach ($optionCheckedCloneArray as $keyGroup => $valueGroup)
-						$parameters .= '/'.$keyGroup.$valueGroup;
+					$parametersLink = '';
+					//create order order by filter position
+					foreach ($filterBlockList as $keyFilter => $valueFilter)
+					{
+						if(!empty($optionCheckedCloneArray[$valueFilter]))
+							$parametersLink .= '/'.$valueFilter.$optionCheckedCloneArray[$valueFilter];
+					}
 					//write link
-					$typeFilter['values'][$key]['link'] =  $linkBase.$parameters;
+					$typeFilter['values'][$key]['link'] =  $linkBase.$parametersLink;
 				}
 			}
-		}
-
 		$nFilters = 0;
+		if(isset($selectedFilters['price']))
+			if($priceArray['min'] == $selectedFilters['price'][0] && $priceArray['max'] == $selectedFilters['price'][1])
+				unset($selectedFilters['price']);
+		if(isset($selectedFilters['weight']))
+			if($weightArray['min'] == $selectedFilters['weight'][0] && $weightArray['max'] == $selectedFilters['weight'][1])
+				unset($selectedFilters['weight']);
+				
 		foreach ($selectedFilters AS $filters)
 			$nFilters += sizeof($filters);
 		
@@ -1896,7 +1845,7 @@ class BlockLayered extends Module
 	 */
 	private static function getPriceFilterSubQuery($filterValue)
 	{
-		$idCurrency = Currency::getCurrent()->id;
+		$idCurrency = (int)Currency::getCurrent()->id;
 		$priceFilterQuery = '';
 		if (isset($filterValue) AND $filterValue)
 		{
@@ -1978,7 +1927,7 @@ class BlockLayered extends Module
 		$queryFiltersWhere = ' AND p.id_product IN (SELECT id_product FROM '._DB_PREFIX_.'category_product cp WHERE ';
 		foreach ($filterValue AS $id_category)
 			$queryFiltersWhere .= 'cp.`id_category` = '.(int)$id_category.' OR ';
-		$queryFiltersWhere = rtrim($queryFilters, 'OR ').') ';
+		$queryFiltersWhere = rtrim($queryFiltersWhere, 'OR ').') ';
 		
 		return array('where' => $queryFiltersWhere, 'join' => $queryFiltersJoin);
 	}
@@ -1997,8 +1946,10 @@ class BlockLayered extends Module
 		if (empty($filterValue))
 			$queryFilters = '';
 		else
+		{
+			array_walk($filterValue, create_function('&$id_manufacturer', '$id_manufacturer = (int)$id_manufacturer;'));
 		$queryFilters = ' AND p.id_manufacturer IN ('.implode($filterValue, ',').')';
-		
+		}
 			if($ignoreJoin)
 		return array('where' => $queryFilters, 'select' => ', m.name');
 			else
@@ -2024,7 +1975,6 @@ class BlockLayered extends Module
 	public function generateFiltersBlock($selectedFilters = array())
 	{
 		return self::generateFiltersBlockNew($selectedFilters);
-		// return self::generateFiltersBlockOld($selectedFilters);
 	}
 	
 	public function ajaxCallBackOffice($categoryBox = array(), $id_layered_filter = NULL)
@@ -2148,9 +2098,32 @@ class BlockLayered extends Module
 	
 	public function ajaxCall()
 	{
-		global $smarty, $cookie;
+		global $smarty;
 
 		$selectedFilters = $this->getSelectedFilters();
+		
+		$this->getProducts($selectedFilters, $products, $nbProducts, $p, $n, $pages_nb, $start, $stop, $range);
+			
+		$smarty->assign('nb_products', $nbProducts);
+		$smarty->assign('category', (object)array('id' => Tools::getValue('id_category_layered', 1)));
+		$pagination_infos = array('pages_nb' => (int)($pages_nb), 'p' => (int)$p, 'n' => (int)$n, 'range' => (int)$range, 'start' => (int)$start, 'stop' => (int)$stop,
+		'nArray' => $nArray = (int)Configuration::get('PS_PRODUCTS_PER_PAGE') != 10 ? array((int)Configuration::get('PS_PRODUCTS_PER_PAGE'), 10, 20, 50) : array(10, 20, 50));
+		$smarty->assign($pagination_infos);
+		$smarty->assign('comparator_max_item', (int)(Configuration::get('PS_COMPARATOR_MAX_ITEM')));
+		$smarty->assign('products', $products);
+		
+		/* We are sending an array in jSon to the .js controller, it will update both the filters and the products zones */
+		return Tools::jsonEncode(array(
+		'filtersBlock' => $this->generateFiltersBlock($selectedFilters),
+		'productList' => $smarty->fetch(_PS_THEME_DIR_.'product-list.tpl'),
+		'pagination' => $smarty->fetch(_PS_THEME_DIR_.'pagination.tpl'),
+		'categoryCount' => $smarty->fetch(_PS_THEME_DIR_.'category-count.tpl')));
+	}
+	
+	public function getProducts($selectedFilters, &$products, &$nbProducts, &$p, &$n, &$pages_nb, &$start, &$stop, &$range)
+	{
+		global $cookie;
+		
 		$products = $this->getProductByFilters($selectedFilters);
 		$products = Product::getProductsProperties((int)$cookie->id_lang, $products);
 		
@@ -2174,19 +2147,6 @@ class BlockLayered extends Module
 		$stop = (int)($p + $range);
 		if ($stop > $pages_nb)
 			$stop = (int)($pages_nb);
-			
-		$smarty->assign('nb_products', $nbProducts);
-		$pagination_infos = array('pages_nb' => (int)($pages_nb), 'p' => (int)$p, 'n' => (int)$n, 'range' => (int)$range, 'start' => (int)$start, 'stop' => (int)$stop,
-		'nArray' => $nArray = (int)Configuration::get('PS_PRODUCTS_PER_PAGE') != 10 ? array((int)Configuration::get('PS_PRODUCTS_PER_PAGE'), 10, 20, 50) : array(10, 20, 50));
-		$smarty->assign($pagination_infos);
-		$smarty->assign('comparator_max_item', (int)(Configuration::get('PS_COMPARATOR_MAX_ITEM')));
-		$smarty->assign('products', $products);
-		
-		/* We are sending an array in jSon to the .js controller, it will update both the filters and the products zones */
-		return Tools::jsonEncode(array(
-		'filtersBlock' => $this->generateFiltersBlock($selectedFilters),
-		'productList' => $smarty->fetch(_PS_THEME_DIR_.'product-list.tpl'),
-		'pagination' => $smarty->fetch(_PS_THEME_DIR_.'pagination.tpl')));
 	}
 
 	public function rebuildLayeredStructure()
diff --git a/modules/blocklayered/blocklayered.tpl b/modules/blocklayered/blocklayered.tpl
index b09fbb713..d9714df52 100644
--- a/modules/blocklayered/blocklayered.tpl
+++ b/modules/blocklayered/blocklayered.tpl
@@ -36,18 +36,19 @@
 					<span class="layered_subtitle" style="float: none;">{l s='Enabled filters:' mod='blocklayered'}</span>
 					<ul>
 					{foreach from=$selected_filters key=filter_type item=filter_values}
-						{foreach from=$filter_values item=filter_value name=f_values}
+						{foreach from=$filter_values key=filter_key item=filter_value name=f_values}
 							{foreach from=$filters item=filter}
 								{if $filter.type == $filter_type && isset($filter.values)}
 									{if isset($filter.slider) && $smarty.foreach.f_values.first}
 										<li>
-											- {$filter.name|escape:html:'UTF-8'}{l s=':'} 
+											<a href="#" rel="layered_{$filter.type}_slider" title="{l s='Cancel' mod='blocklayered'}">x</a>
+											{$filter.name|escape:html:'UTF-8'}{l s=':'} 
 											{$filter.values[0]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'} - 
 											{$filter.values[1]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'}
 										</li>
 									{else}
 										{foreach from=$filter.values key=id_value item=value}
-											{if $id_value == $filter_value}
+											{if $id_value == $filter_key && !is_numeric($filter_value) && ($filter.type eq 'id_attribute_group' || $filter.type eq 'id_feature') || $id_value == $filter_value && $filter.type neq 'id_attribute_group'}
 												<li>
 													<a href="#" rel="layered_{$filter.type_lite}_{$id_value}" title="{l s='Cancel' mod='blocklayered'}">x</a>
 													{$filter.name|escape:html:'UTF-8'}{l s=':'} {$value.name|escape:html:'UTF-8'}
@@ -64,16 +65,20 @@
 				{/if}
 				{foreach from=$filters item=filter}
 					{if isset($filter.values)}
+						{if isset($filter.slider)}
+						<div class="layered_{$filter.type}" style="display: none;">
+						{else}
 					<div>
+						{/if}
 						<span class="layered_subtitle">{$filter.name|escape:html:'UTF-8'}</span>
 						<span class="layered_close"><a href="#" rel="layered_{$filter.type}_{$filter.id_key}">v</a></span>
 						<div class="clear"></div>
-						<ul id="layered_{$filter.type}_{$filter.id_key}">
+						<ul id="ul_layered_{$filter.type}_{$filter.id_key}">
 						{if !isset($filter.slider)}
 							{foreach from=$filter.values key=id_value item=value}
 								<li class="nomargin">
 								{if isset($filter.is_color_group) && $filter.is_color_group}
-									<input type="button" name="layered_{$filter.type_lite}_{$id_value}" rel="{$id_value}_{$filter.id_key}" id="layered_attribute_{$id_value}" {if !$value.nbr} value="X" disabled="disabled"{/if} style="background: {if isset($value.color)}{$value.color}{else}#CCC{/if}; margin-left: 0; width: 16px; height: 16px; padding:0; border: 1px solid {if isset($value.checked) && $value.checked}red{else}#666{/if};" />
+									<input type="button" name="layered_{$filter.type_lite}_{$id_value}" rel="{$id_value}_{$filter.id_key}" id="layered_id_attribute_group_{$id_value}" {if !$value.nbr} value="X" disabled="disabled"{/if} style="background: {if isset($value.color)}{$value.color}{else}#CCC{/if}; margin-left: 0; width: 16px; height: 16px; padding:0; border: 1px solid {if isset($value.checked) && $value.checked}red{else}#666{/if};" />
 									{if isset($value.checked) && $value.checked}<input type="hidden" name="layered_{$filter.type_lite}_{$id_value}" value="{$id_value}" />{/if}
 								{else}
 										<input type="checkbox" class="checkbox" name="layered_{$filter.type_lite}_{$id_value}" id="layered_{$filter.type_lite}{if $id_value || $filter.type == 'quantity'}_{$id_value}{/if}" value="{$id_value}{if $filter.id_key}_{$filter.id_key}{/if}"{if isset($value.checked)} checked="checked"{/if}{if !$value.nbr} disabled="disabled"{/if} /> 
@@ -88,9 +93,7 @@
 							</div>
 							<script type="text/javascript">
 							{literal}
-								$(document).ready(function()
-								{
-									$('#layered_{/literal}{$filter.type}{literal}_slider').slider({
+								addSlider('{/literal}{$filter.type}{literal}',{
 										range: true,
 										min: {/literal}{$filter.min}{literal},
 										max: {/literal}{$filter.max}{literal},
@@ -101,10 +104,11 @@
 										stop: function () {
 											reloadContent();
 										}
+								}, '{/literal}{$filter.unit}{literal}');
+								$(document).ready(function()
+								{
+									$('.layered_{/literal}{$filter.type}{literal}').show();
 									});
-									$('#layered_{/literal}{$filter.type}{literal}_range').html($('#layered_{/literal}{$filter.type}{literal}_slider').slider('values', 0 ) +'{/literal}{$filter.unit}{literal}'+
-										' - ' + $('#layered_{/literal}{$filter.type}{literal}_slider').slider('values', 1 )+'{/literal}{$filter.unit}{literal}');
-								});
 							{/literal}
 							</script>
 						{/if}
diff --git a/modules/blocklayered/de.php b/modules/blocklayered/de.php
index 7751ede93..01f9ac000 100644
--- a/modules/blocklayered/de.php
+++ b/modules/blocklayered/de.php
@@ -4,34 +4,20 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{blocklayered}prestashop>blocklayered_84241e458cdd5162745500a59a3680f3'] = 'Layered Navigation-Block';
 $_MODULE['<{blocklayered}prestashop>blocklayered_2d08fa8e157fe3f1875402cbd98aee1b'] = 'Zeigt einen Block mit Layered Navigation-Filter an';
-$_MODULE['<{blocklayered}prestashop>blocklayered_7ad3f384bcf30d783b5a6f6c810b4762'] = 'Layered Navigation Datanbank wurde erfolgreich initialisiert';
 $_MODULE['<{blocklayered}prestashop>blocklayered_fe016d3b990c2a9dd72ab6b45892f2ae'] = 'Einstellungen erfolgreich gespeichert';
 $_MODULE['<{blocklayered}prestashop>blocklayered_09da2b6f1217055bb22caa6ea08d9b80'] = 'Layered Navigation';
-$_MODULE['<{blocklayered}prestashop>blocklayered_382a0cf3c7ea26e9c7d0642d6d0ec07d'] = 'Das Modul ist noch in der Beta Version und wird weiter entwickelt';
-$_MODULE['<{blocklayered}prestashop>blocklayered_016d6031144c99f759b36c5e00c79e91'] = '10 weitere Neuerungen';
-$_MODULE['<{blocklayered}prestashop>blocklayered_b77ae7b3f227f97fdbfbaee819c048d6'] = 'Echtzeit-Aktualisierung der Cache-Tabelle';
-$_MODULE['<{blocklayered}prestashop>blocklayered_3cd881c5805a5564b080022968081652'] = 'Zusätzliche Filter (Preise, Gewicht)';
-$_MODULE['<{blocklayered}prestashop>blocklayered_f67587ba40eff59a15796352c9037ddf'] = 'Fähigkeit, Filter nach Kategorie in der Modulkonfiguration zu verwalten ';
-$_MODULE['<{blocklayered}prestashop>blocklayered_559175435fec02f846564385b20b98e2'] = 'Fähigkeit, Filtergruppen zu verbergen, die keine Werte und Filter-Werte mit 0 Produkten haben';
-$_MODULE['<{blocklayered}prestashop>blocklayered_abb461f7d4d8271a12ceead064d13cd0'] = 'Statistik und Analyse';
-$_MODULE['<{blocklayered}prestashop>blocklayered_6af4dd46928a781eda42b940d3394ca6'] = 'Produktsortierung & Paginierung verwalten ';
-$_MODULE['<{blocklayered}prestashop>blocklayered_b4ecb2bd1ea5153550669329db53277d'] = 'Kontrolle zur Kategorie-Gruppentabelle hinzufügen';
-$_MODULE['<{blocklayered}prestashop>blocklayered_d99bf479cc40101e28f1f0ba1bfb6150'] = 'SEO Links & Echtzeit URL einrichten (Fähigkeit, die URL jemandem zu geben)';
-$_MODULE['<{blocklayered}prestashop>blocklayered_27c7b93d882068a1137a9350c7f1a132'] = 'Weitere Optionen zur Modul-Konfiguration hinzufügen';
-$_MODULE['<{blocklayered}prestashop>blocklayered_fb8082696a8d7a40fa62ea0e89b18c32'] = 'Leistungsverbesserungen';
 $_MODULE['<{blocklayered}prestashop>blocklayered_af1b98adf7f686b84cd0b443e022b7a0'] = 'Kategorien';
-$_MODULE['<{blocklayered}prestashop>blocklayered_9e2941b3c81256fac10392aaca4ccfde'] = 'Zustand';
+$_MODULE['<{blocklayered}prestashop>blocklayered_8524de963f07201e5c086830d370797f'] = 'Lädt...';
+$_MODULE['<{blocklayered}prestashop>blocklayered_8c489d0946f66d17d73f26366a4bf620'] = 'Gewicht';
 $_MODULE['<{blocklayered}prestashop>blocklayered_03c2e7e41ffc181a4e84080b4710e81e'] = 'Neu';
 $_MODULE['<{blocklayered}prestashop>blocklayered_019d1ca7d50cc54b995f60d456435e87'] = 'Gebraucht';
 $_MODULE['<{blocklayered}prestashop>blocklayered_6da03a74721a0554b7143254225cc08a'] = 'Überholt';
-$_MODULE['<{blocklayered}prestashop>blocklayered_faeaec9eda6bc4c8cb6e1a9156a858be'] = 'Verfügbarkeit';
-$_MODULE['<{blocklayered}prestashop>blocklayered_fcebe56087b9373f15514831184fa572'] = 'Auf Lager';
+$_MODULE['<{blocklayered}prestashop>blocklayered_9e2941b3c81256fac10392aaca4ccfde'] = 'Zustand';
 $_MODULE['<{blocklayered}prestashop>blocklayered_2d25c72c1b18e562f6654fff8e11711e'] = 'Nicht verfügbar';
+$_MODULE['<{blocklayered}prestashop>blocklayered_fcebe56087b9373f15514831184fa572'] = 'Auf Lager';
+$_MODULE['<{blocklayered}prestashop>blocklayered_faeaec9eda6bc4c8cb6e1a9156a858be'] = 'Verfügbarkeit';
 $_MODULE['<{blocklayered}prestashop>blocklayered_c0bd7654d5b278e65f21cf4e9153fdb4'] = 'Hersteller';
-$_MODULE['<{blocklayered}prestashop>blocklayered_8c489d0946f66d17d73f26366a4bf620'] = 'Gewicht';
 $_MODULE['<{blocklayered}prestashop>blocklayered_c32516babc5b6c47eb8ce1bfc223253c'] = 'Katalog';
 $_MODULE['<{blocklayered}prestashop>blocklayered_1262d1b9fbffb3a8e85ac9e4b449e989'] = 'Aktivierte Filter:';
 $_MODULE['<{blocklayered}prestashop>blocklayered_853ae90f0351324bd73ea615e6487517'] = ':';
 $_MODULE['<{blocklayered}prestashop>blocklayered_ea4788705e6873b424c65e91c2846b19'] = 'Abbrechen';
-$_MODULE['<{blocklayered}prestashop>blocklayered_87ba2ecc8b6915e8bd6f5089918229fd'] = 'Bereich';
-$_MODULE['<{blocklayered}prestashop>blocklayered_8524de963f07201e5c086830d370797f'] = 'Lädt...';
diff --git a/modules/blocklayered/fr.php b/modules/blocklayered/fr.php
index 29086cbc5..d5420d370 100644
--- a/modules/blocklayered/fr.php
+++ b/modules/blocklayered/fr.php
@@ -4,13 +4,10 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{blocklayered}prestashop>blocklayered_84241e458cdd5162745500a59a3680f3'] = 'Bloc navigation à facettes';
 $_MODULE['<{blocklayered}prestashop>blocklayered_2d08fa8e157fe3f1875402cbd98aee1b'] = 'Affiche un bloc avec les filtres de la navigation à facettes';
-$_MODULE['<{blocklayered}prestashop>blocklayered_1b90c001d668d0ec894392d8e6695054'] = 'Vous devez activer l\'extension cURL sur votre serveur si vous désirez utiliser des liens courts.';
-$_MODULE['<{blocklayered}prestashop>blocklayered_7ad3f384bcf30d783b5a6f6c810b4762'] = 'La base de données de la navigation à facettes à été initialisée avec succès';
 $_MODULE['<{blocklayered}prestashop>blocklayered_817c37b9c1f5cd4a450dad384e63e6c7'] = 'Votre filtre';
 $_MODULE['<{blocklayered}prestashop>blocklayered_3185cefd67b575e582063148e4f15860'] = 'a été mis à jour avec succès.';
 $_MODULE['<{blocklayered}prestashop>blocklayered_7ccab4d8de5d6b9bb61e99c7bba343ab'] = 'a été ajouté avec succès.';
 $_MODULE['<{blocklayered}prestashop>blocklayered_fe016d3b990c2a9dd72ab6b45892f2ae'] = 'Paramètres enregistrés avec succès';
-$_MODULE['<{blocklayered}prestashop>blocklayered_bb291cb01196158549fba8f6fe636d4a'] = 'Paramètres non enregistré:';
 $_MODULE['<{blocklayered}prestashop>blocklayered_4ad0f0fe31d93e0d8dd7a7fc69a72784'] = 'Modèle de filtres supprimé, catégories mises à jour (Modèle par défaut appliqué).';
 $_MODULE['<{blocklayered}prestashop>blocklayered_91e77d047f2496b7ba8c9def96d03324'] = 'Modèle de filtres non trouvé';
 $_MODULE['<{blocklayered}prestashop>blocklayered_09da2b6f1217055bb22caa6ea08d9b80'] = 'Navigation à facettes';
@@ -54,16 +51,16 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_93cba07454f06a4a960172bbd6e2a43
 $_MODULE['<{blocklayered}prestashop>blocklayered_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non';
 $_MODULE['<{blocklayered}prestashop>blocklayered_8531c73de81b9ed94322dda7cf947daa'] = 'Afficher le nombre de produits qui correspondent';
 $_MODULE['<{blocklayered}prestashop>blocklayered_cf565402d32b79d33f626252949a6941'] = 'Configuration enregistré';
-$_MODULE['<{blocklayered}prestashop>blocklayered_9e2941b3c81256fac10392aaca4ccfde'] = 'Etat';
+$_MODULE['<{blocklayered}prestashop>blocklayered_3601146c4e948c32b6424d2c0a7f0118'] = 'Prix';
+$_MODULE['<{blocklayered}prestashop>blocklayered_8c489d0946f66d17d73f26366a4bf620'] = 'Poids';
 $_MODULE['<{blocklayered}prestashop>blocklayered_03c2e7e41ffc181a4e84080b4710e81e'] = 'Neuf';
 $_MODULE['<{blocklayered}prestashop>blocklayered_019d1ca7d50cc54b995f60d456435e87'] = 'Occasion';
 $_MODULE['<{blocklayered}prestashop>blocklayered_6da03a74721a0554b7143254225cc08a'] = 'Reconditionné';
-$_MODULE['<{blocklayered}prestashop>blocklayered_faeaec9eda6bc4c8cb6e1a9156a858be'] = 'Disponibilité';
-$_MODULE['<{blocklayered}prestashop>blocklayered_fcebe56087b9373f15514831184fa572'] = 'En stock';
+$_MODULE['<{blocklayered}prestashop>blocklayered_9e2941b3c81256fac10392aaca4ccfde'] = 'Etat';
 $_MODULE['<{blocklayered}prestashop>blocklayered_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible';
+$_MODULE['<{blocklayered}prestashop>blocklayered_fcebe56087b9373f15514831184fa572'] = 'En stock';
+$_MODULE['<{blocklayered}prestashop>blocklayered_faeaec9eda6bc4c8cb6e1a9156a858be'] = 'Disponibilité';
 $_MODULE['<{blocklayered}prestashop>blocklayered_c0bd7654d5b278e65f21cf4e9153fdb4'] = 'Fabricant';
-$_MODULE['<{blocklayered}prestashop>blocklayered_8c489d0946f66d17d73f26366a4bf620'] = 'Poids';
-$_MODULE['<{blocklayered}prestashop>blocklayered_3601146c4e948c32b6424d2c0a7f0118'] = 'Prix';
 $_MODULE['<{blocklayered}prestashop>blocklayered_308edffd52afae39cc6277e246ec5df8'] = 'Filtres disponibles';
 $_MODULE['<{blocklayered}prestashop>blocklayered_cfbc982f8fb7a0cc3abb3c85c795ab41'] = 'Filtre sous-catégories';
 $_MODULE['<{blocklayered}prestashop>blocklayered_cd50ff1c5332f9920acf8173c4aab425'] = 'Filtre stock du produit';
diff --git a/modules/ebay/ajax/loadCategoryMatch.php b/modules/ebay/ajax/loadCategoryMatch.php
index 17478633c..d642128d0 100755
--- a/modules/ebay/ajax/loadCategoryMatch.php
+++ b/modules/ebay/ajax/loadCategoryMatch.php
@@ -5,7 +5,10 @@ if (file_exists($configPath))
 {
 	include('../../../config/config.inc.php');
 	if (!Tools::getValue('token') || Tools::getValue('token') != Configuration::get('EBAY_SECURITY_TOKEN'))
-		die('ERROR :X');
+		die('ERROR : INVALID TOKEN');
+
+	// Fix for limit db sql request in time
+	sleep(1);
 
 	$currentPath = Db::getInstance()->getRow('
 	SELECT ecc.`id_ebay_category`, ec.`id_category_ref`, ec.`id_category_ref_parent`, ec.`level`
diff --git a/modules/ebay/eBayRequest.php b/modules/ebay/eBayRequest.php
index 14f97c0b1..29ec725ea 100755
--- a/modules/ebay/eBayRequest.php
+++ b/modules/ebay/eBayRequest.php
@@ -1086,7 +1086,8 @@ class eBayRequest
 		if (isset($this->response->OrderArray))
 			foreach ($this->response->OrderArray->Order as $order)
 			{
-				$name = explode(' ', (string)$order->ShippingAddress->Name);
+				$name = str_replace(array('_', ',', '  '), array('', '', ' '), (string)$order->ShippingAddress->Name); 
+				$name = explode(' ', $name);
 				$itemList = array();
 				for ($i = 0; isset($order->TransactionArray->Transaction[$i]); $i++)
 				{
diff --git a/modules/ebay/ebay.php b/modules/ebay/ebay.php
index 9999f47b8..4497308e8 100755
--- a/modules/ebay/ebay.php
+++ b/modules/ebay/ebay.php
@@ -359,8 +359,8 @@ class Ebay extends Module
 							$id_customer = (int)Db::getInstance()->getValue('SELECT `id_customer` FROM `'._DB_PREFIX_.'customer` WHERE `active` = 1 AND `email` = \''.pSQL($order['email']).'\' AND `deleted` = 0'.(substr(_PS_VERSION_, 0, 3) == '1.3' ? '' : ' AND `is_guest` = 0'));
 
 							// Check for empty name
-							$order['firstname'] = str_replace('_', '', trim($order['firstname']));
-							$order['familyname'] = str_replace('_', '', trim($order['familyname']));
+							$order['firstname'] = trim($order['firstname']);
+							$order['familyname'] = trim($order['familyname']);
 							if (empty($order['familyname']))
 								$order['familyname'] = $order['firstname'];
 							if (empty($order['firstname']))
@@ -966,6 +966,7 @@ class Ebay extends Module
 			function loadCategoryMatch(id_category)
 			{
 				$.ajax({
+				  async: false,
 				  url: "'._MODULE_DIR_.'ebay/ajax/loadCategoryMatch.php?token='.Configuration::get('EBAY_SECURITY_TOKEN').'&id_category=" + id_category + "&time='.pSQL(date('Ymdhis')).'",
 				  success: function(data) { $("#categoryPath" + id_category).html(data); }
 				});
diff --git a/modules/fedexcarrier/RateService_v9.wsdl b/modules/fedexcarrier/RateService_v10.wsdl
similarity index 86%
rename from modules/fedexcarrier/RateService_v9.wsdl
rename to modules/fedexcarrier/RateService_v10.wsdl
index 88d1b64d2..26ea702ec 100644
--- a/modules/fedexcarrier/RateService_v9.wsdl
+++ b/modules/fedexcarrier/RateService_v10.wsdl
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://fedex.com/ws/rate/v9" xmlns:s1="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://fedex.com/ws/rate/v9" name="RateServiceDefinitions">
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://fedex.com/ws/rate/v10" xmlns:s1="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://fedex.com/ws/rate/v10" name="RateServiceDefinitions">
   <types>
-    <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://fedex.com/ws/rate/v9">
-      <xs:element name="RateRequest" type="ns:RateRequest"/>
+    <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://fedex.com/ws/rate/v10">
       <xs:element name="RateReply" type="ns:RateReply"/>
-	  <xs:complexType name="AdditionalLabelsDetail">
+      <xs:element name="RateRequest" type="ns:RateRequest"/>
+      <xs:complexType name="AdditionalLabelsDetail">
         <xs:annotation>
           <xs:documentation>Specifies additional labels to be produced. All required labels for shipments will be produced without the need to request additional labels. These are only available as thermal labels.</xs:documentation>
         </xs:annotation>
@@ -36,14 +35,14 @@
           <xs:enumeration value="SHIPPER"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Address">
+      <xs:complexType name="Address">
         <xs:annotation>
           <xs:documentation>Descriptive data for a physical location. May be used as an actual physical address (place to which one could go), or as a container of "address parts" which should be handled as a unit (such as a city-state-ZIP combination within the US).</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="StreetLines" type="xs:string" minOccurs="0" maxOccurs="2">
             <xs:annotation>
-              <xs:documentation>Combination of number, street name, etc. At least one line is required for a valid physical address; empty lines should not be included.</xs:documentation>              
+              <xs:documentation>Combination of number, street name, etc. At least one line is required for a valid physical address; empty lines should not be included.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="City" type="xs:string" minOccurs="0">
@@ -53,12 +52,12 @@
           </xs:element>
           <xs:element name="StateOrProvinceCode" type="xs:string" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Identifying abbreviation for US state, Canada province, etc. Format and presence of this field will vary, depending on country.</xs:documentation>              
+              <xs:documentation>Identifying abbreviation for US state, Canada province, etc. Format and presence of this field will vary, depending on country.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="PostalCode" type="xs:string" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Identification of a region (usually small) for mail/package delivery. Format and presence of this field will vary, depending on country.</xs:documentation>              
+              <xs:documentation>Identification of a region (usually small) for mail/package delivery. Format and presence of this field will vary, depending on country.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="UrbanizationCode" type="xs:string" minOccurs="0">
@@ -68,17 +67,17 @@
           </xs:element>
           <xs:element name="CountryCode" type="xs:string" minOccurs="1">
             <xs:annotation>
-              <xs:documentation>The two-letter code used to identify a country.</xs:documentation>              
+              <xs:documentation>The two-letter code used to identify a country.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="Residential" type="xs:boolean" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Indicates whether this address is residential (as opposed to commercial).</xs:documentation>
+              <xs:documentation>Indicates whether this address residential (as opposed to commercial).</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="B13AFilingOptionType">
+      <xs:simpleType name="B13AFilingOptionType">
         <xs:annotation>
           <xs:documentation>
             Specifies which filing option is being exercised by the customer.
@@ -110,12 +109,12 @@
           <xs:enumeration value="UCC128"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="CarrierCodeType">
+      <xs:simpleType name="CarrierCodeType">
         <xs:annotation>
           <xs:documentation>Identification of a FedEx operating company (transportation).</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-		  <xs:enumeration value="FDXC"/>
+          <xs:enumeration value="FDXC"/>
           <xs:enumeration value="FDXE"/>
           <xs:enumeration value="FDXG"/>
           <xs:enumeration value="FXCC"/>
@@ -123,7 +122,7 @@
           <xs:enumeration value="FXSP"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="CertificateOfOriginDetail">
+      <xs:complexType name="CertificateOfOriginDetail">
         <xs:annotation>
           <xs:documentation>The instructions indicating how to print the Certificate of Origin ( e.g. whether or not to include the instructions, image type, etc ...)</xs:documentation>
         </xs:annotation>
@@ -133,14 +132,20 @@
               <xs:documentation>Specifies characteristics of a shipping document to be produced.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="CustomerImageUsages" type="ns:CustomerImageUsage" minOccurs="0">
+          <xs:element name="CustomerImageUsages" type="ns:CustomerImageUsage" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
               <xs:documentation>Specifies the usage and identification of customer supplied images to be used on this document.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="ClearanceBrokerageType">
+      <xs:simpleType name="ChargeBasisLevelType">
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="CURRENT_PACKAGE"/>
+          <xs:enumeration value="SUM_OF_PACKAGES"/>
+        </xs:restriction>
+      </xs:simpleType>
+      <xs:simpleType name="ClearanceBrokerageType">
         <xs:annotation>
           <xs:documentation>Specifies the type of brokerage to be applied to a shipment.</xs:documentation>
         </xs:annotation>
@@ -152,19 +157,19 @@
           <xs:enumeration value="BROKER_UNASSIGNED"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="ClientDetail">
+      <xs:complexType name="ClientDetail">
         <xs:annotation>
           <xs:documentation>Descriptive data for the client submitting a transaction.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="AccountNumber" type="xs:string" minOccurs="1">
             <xs:annotation>
-              <xs:documentation>The FedEx account number associated with this transaction.</xs:documentation>              
+              <xs:documentation>The FedEx account number associated with this transaction.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="MeterNumber" type="xs:string" minOccurs="1">
             <xs:annotation>
-              <xs:documentation>This number is assigned by FedEx and identifies the unique device from which the request is originating.</xs:documentation>              
+              <xs:documentation>This number is assigned by FedEx and identifies the unique device from which the request is originating</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="IntegratorId" type="xs:string" minOccurs="0">
@@ -184,26 +189,22 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="CodAddTransportationChargesType">
-        <xs:annotation>
-          <xs:documentation>Identifies what freight charges should be added to the COD collect amount.</xs:documentation>
-        </xs:annotation>
+      <xs:simpleType name="CodAddTransportationChargeBasisType">
         <xs:restriction base="xs:string">
-          <xs:enumeration value="ADD_ACCOUNT_COD_SURCHARGE"/>
-          <xs:enumeration value="ADD_ACCOUNT_NET_CHARGE"/>
-          <xs:enumeration value="ADD_ACCOUNT_NET_FREIGHT"/>
-          <xs:enumeration value="ADD_ACCOUNT_TOTAL_CUSTOMER_CHARGE"/>
-          <xs:enumeration value="ADD_LIST_COD_SURCHARGE"/>
-          <xs:enumeration value="ADD_LIST_NET_CHARGE"/>
-          <xs:enumeration value="ADD_LIST_NET_FREIGHT"/>
-          <xs:enumeration value="ADD_LIST_TOTAL_CUSTOMER_CHARGE"/>
-          <xs:enumeration value="ADD_SUM_OF_ACCOUNT_NET_CHARGES"/>
-          <xs:enumeration value="ADD_SUM_OF_ACCOUNT_NET_FREIGHT"/>
-          <xs:enumeration value="ADD_SUM_OF_LIST_NET_CHARGES"/>
-          <xs:enumeration value="ADD_SUM_OF_LIST_NET_FREIGHT"/>
+          <xs:enumeration value="COD_SURCHARGE"/>
+          <xs:enumeration value="NET_CHARGE"/>
+          <xs:enumeration value="NET_FREIGHT"/>
+          <xs:enumeration value="TOTAL_CUSTOMER_CHARGE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="CodCollectionType">
+      <xs:complexType name="CodAddTransportationChargesDetail">
+        <xs:sequence>
+          <xs:element name="RateTypeBasis" type="ns:RateTypeBasisType" minOccurs="0"/>
+          <xs:element name="ChargeBasis" type="ns:CodAddTransportationChargeBasisType" minOccurs="0"/>
+          <xs:element name="ChargeBasisLevel" type="ns:ChargeBasisLevelType" minOccurs="0"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:simpleType name="CodCollectionType">
         <xs:annotation>
           <xs:documentation>Identifies the type of funds FedEx should collect upon shipment delivery.</xs:documentation>
         </xs:annotation>
@@ -213,15 +214,15 @@
           <xs:enumeration value="GUARANTEED_FUNDS"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="CodDetail">
+      <xs:complexType name="CodDetail">
         <xs:annotation>
           <xs:documentation>Descriptive data required for a FedEx COD (Collect-On-Delivery) shipment.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-		  <xs:element name="CodCollectionAmount" type="ns:Money" minOccurs="0"/>
-		  <xs:element name="AddTransportationCharges" type="ns:CodAddTransportationChargesType" minOccurs="0">
+          <xs:element name="CodCollectionAmount" type="ns:Money" minOccurs="0"/>
+          <xs:element name="AddTransportationChargesDetail" type="ns:CodAddTransportationChargesDetail" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Identifies if freight charges are to be added to the COD amount. This element determines which freight charges should be added to the COD collect amount. See CodAddTransportationChargesType for a list of valid enumerated values.</xs:documentation>
+              <xs:documentation>Specifies the details of the charges are to be added to the COD collect amount.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="CollectionType" type="ns:CodCollectionType" minOccurs="1">
@@ -231,7 +232,7 @@
           </xs:element>
           <xs:element name="CodRecipient" type="ns:Party" minOccurs="0">
             <xs:annotation>
-			  <xs:documentation>For Express this is the descriptive data that is used for the recipient of the FedEx Letter containing the COD payment. For Ground this is the descriptive data for the party to receive the payment that prints the COD receipt.</xs:documentation>
+              <xs:documentation>For Express this is the descriptive data that is used for the recipient of the FedEx Letter containing the COD payment. For Ground this is the descriptive data for the party to receive the payment that prints the COD receipt.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="ReferenceIndicator" type="ns:CodReturnReferenceIndicatorType" minOccurs="0">
@@ -241,7 +242,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="CodReturnReferenceIndicatorType">
+      <xs:simpleType name="CodReturnReferenceIndicatorType">
         <xs:annotation>
           <xs:documentation>Indicates which type of reference information to include on the COD return shipping label.</xs:documentation>
         </xs:annotation>
@@ -252,14 +253,14 @@
           <xs:enumeration value="TRACKING"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="CommercialInvoice">
+      <xs:complexType name="CommercialInvoice">
         <xs:annotation>
           <xs:documentation>CommercialInvoice element is required for electronic upload of CI data. It will serve to create/transmit an Electronic Commercial Invoice through the FedEx Systems. Customers are responsible for printing their own Commercial Invoice.If you would likeFedEx to generate a Commercial Invoice and transmit it to Customs. for clearance purposes, you need to specify that in the ShippingDocumentSpecification element. If you would like a copy of the Commercial Invoice that FedEx generated returned to you in reply it needs to be specified in the ETDDetail/RequestedDocumentCopies element. Commercial Invoice support consists of maximum of 99 commodity line items.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="Comments" type="xs:string" minOccurs="0" maxOccurs="99">
             <xs:annotation>
-              <xs:documentation>Any comments that need to be communicated about this shipment.</xs:documentation>              
+              <xs:documentation>Any comments that need to be communicated about this shipment.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="FreightCharge" type="ns:Money" minOccurs="0">
@@ -272,7 +273,12 @@
               <xs:documentation>Any taxes or miscellaneous charges(other than Freight charges or Insurance charges) that are associated with this shipment.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="PackingCosts" type="ns:Money" minOccurs="0">
+          <xs:element name="TaxesOrMiscellaneousChargeType" type="ns:TaxesOrMiscellaneousChargeType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Specifies which kind of charge is being recorded in the preceding field.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="PackingCosts" type="ns:Money" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Any packing costs that are associated with this shipment.</xs:documentation>
             </xs:annotation>
@@ -302,29 +308,24 @@
               <xs:documentation>The reason for the shipment. Note: SOLD is not a valid purpose for a Proforma Invoice.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="PurposeOfShipmentDescription" type="xs:string" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Descriptive text for the purpose of the shipment.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
           <xs:element name="CustomerInvoiceNumber" type="xs:string" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Customer assigned invoice number.</xs:documentation>              
+              <xs:documentation>Customer assigned Invoice number</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="OriginatorName" type="xs:string" minOccurs="0">
+          <xs:element name="OriginatorName" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Name of the International Expert that completed the Commercial Invoice different from Sender.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="TermsOfSale" type="ns:TermsOfSaleType" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Required for dutiable international Express or Ground shipment. This field is not applicable to an international PIB(document) or a non-document which does not require a Commercial Invoice.</xs:documentation>
+              <xs:documentation>Required for dutiable international Express or Ground shipment. This field is not applicable to an international PIB(document) or a non-document which does not require a Commercial Invoice</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="CommercialInvoiceDetail">
+      <xs:complexType name="CommercialInvoiceDetail">
         <xs:annotation>
           <xs:documentation>The instructions indicating how to print the Commercial Invoice( e.g. image type) Specifies characteristics of a shipping document to be produced.</xs:documentation>
         </xs:annotation>
@@ -337,7 +338,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="CommitDetail">
+      <xs:complexType name="CommitDetail">
         <xs:annotation>
           <xs:documentation>Information about the transit time and delivery commitment date and time.</xs:documentation>
         </xs:annotation>
@@ -357,7 +358,7 @@
               <xs:documentation>Shows the specific combination of service options combined with the service type that produced this committment in the set returned to the caller.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
+          <xs:element name="AppliedSubOptions" type="ns:ServiceSubOptionDetail" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Supporting detail for applied options identified in preceding field.</xs:documentation>
             </xs:annotation>
@@ -377,7 +378,7 @@
               <xs:documentation>The number of transit days; applies to Ground and LTL Freight; indicates minimum transit time for SmartPost.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="MaximumTransitTime" type="ns:TransitTimeType" minOccurs="0">
+          <xs:element name="MaximumTransitTime" type="ns:TransitTimeType" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Maximum number of transit days, for SmartPost shipments.</xs:documentation>
             </xs:annotation>
@@ -437,7 +438,7 @@
               <xs:documentation>Information about why a shipment delivery is delayed and at what level (country/service etc.).</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="DocumentContent" type="ns:InternationalDocumentContentType" minOccurs="0"/>
+          <xs:element name="DocumentContent" type="ns:InternationalDocumentContentType" minOccurs="0"/>
           <xs:element name="RequiredDocuments" type="ns:RequiredShippingDocumentType" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
               <xs:documentation>Required documentation for this shipment.</xs:documentation>
@@ -450,7 +451,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="CommitmentDelayType">
+      <xs:simpleType name="CommitmentDelayType">
         <xs:annotation>
           <xs:documentation>The type of delay this shipment will encounter.</xs:documentation>
         </xs:annotation>
@@ -468,7 +469,7 @@
           <xs:enumeration value="WEEKEND_SPECIAL"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Commodity">
+      <xs:complexType name="Commodity">
         <xs:annotation>
           <xs:documentation>
             For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
@@ -581,7 +582,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="ConfigurableLabelReferenceEntry">
+      <xs:complexType name="ConfigurableLabelReferenceEntry">
         <xs:annotation>
           <xs:documentation>Defines additional data to print in the Configurable portion of the label, this allows you to print the same type information on the label that can also be printed on the doc tab.</xs:documentation>
         </xs:annotation>
@@ -608,17 +609,17 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="Contact">
+      <xs:complexType name="Contact">
         <xs:annotation>
           <xs:documentation>The descriptive data for a point-of-contact person.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-		  <xs:element name="ContactId" type="xs:string" minOccurs="0">
+          <xs:element name="ContactId" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Client provided identifier corresponding to this contact information.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="PersonName" type="xs:string" minOccurs="0">
+          <xs:element name="PersonName" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Identifies the contact person's name.</xs:documentation>
             </xs:annotation>
@@ -656,23 +657,17 @@
           <xs:element name="EMailAddress" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Identifies the email address associated with this contact.</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>
-                  <ns:Express>120</ns:Express>
-                  <ns:Ground>35</ns:Ground>
-                </xs:MaxLength>
-              </xs:appinfo>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="ContactAndAddress">
+      <xs:complexType name="ContactAndAddress">
         <xs:sequence>
           <xs:element name="Contact" type="ns:Contact" minOccurs="0"/>
           <xs:element name="Address" type="ns:Address" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="ContentRecord">
+      <xs:complexType name="ContentRecord">
         <xs:sequence>
           <xs:element name="PartNumber" type="xs:string" minOccurs="0"/>
           <xs:element name="ItemNumber" type="xs:string" minOccurs="0"/>
@@ -680,7 +675,7 @@
           <xs:element name="Description" type="xs:string" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="CurrencyExchangeRate">
+      <xs:complexType name="CurrencyExchangeRate">
         <xs:annotation>
           <xs:documentation>Specifies the currency exchange performed on financial amounts for this rate.</xs:documentation>
         </xs:annotation>
@@ -702,7 +697,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="CustomDeliveryWindowDetail">
+      <xs:complexType name="CustomDeliveryWindowDetail">
         <xs:sequence>
           <xs:element name="Type" type="ns:CustomDeliveryWindowType" minOccurs="0">
             <xs:annotation>
@@ -726,7 +721,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="CustomDeliveryWindowType">
+      <xs:simpleType name="CustomDeliveryWindowType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="AFTER"/>
           <xs:enumeration value="BEFORE"/>
@@ -734,7 +729,7 @@
           <xs:enumeration value="ON"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="CustomDocumentDetail">
+      <xs:complexType name="CustomDocumentDetail">
         <xs:annotation>
           <xs:documentation>Data required to produce a custom-specified document, either at shipment or package level.</xs:documentation>
         </xs:annotation>
@@ -761,7 +756,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="CustomLabelBarcodeEntry">
+      <xs:complexType name="CustomLabelBarcodeEntry">
         <xs:annotation>
           <xs:documentation>Constructed string, based on format and zero or more data fields, printed in specified barcode symbology.</xs:documentation>
         </xs:annotation>
@@ -783,8 +778,8 @@
           <xs:documentation>Solid (filled) rectangular area on label.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="TopLeftCorner" type="ns:CustomLabelPosition"/>
-          <xs:element name="BottomRightCorner" type="ns:CustomLabelPosition"/>
+          <xs:element name="TopLeftCorner" type="ns:CustomLabelPosition" minOccurs="1"/>
+          <xs:element name="BottomRightCorner" type="ns:CustomLabelPosition" minOccurs="1"/>
         </xs:sequence>
       </xs:complexType>
       <xs:simpleType name="CustomLabelCoordinateUnits">
@@ -859,36 +854,36 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="CustomerImageUsage">
+      <xs:complexType name="CustomerImageUsage">
         <xs:sequence>
           <xs:element name="Type" type="ns:CustomerImageUsageType" minOccurs="0"/>
           <xs:element name="Id" type="ns:ImageId" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="CustomerImageUsageType">
+      <xs:simpleType name="CustomerImageUsageType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="LETTER_HEAD"/>
           <xs:enumeration value="SIGNATURE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="CustomerReference">
+      <xs:complexType name="CustomerReference">
         <xs:annotation>
           <xs:documentation>Reference information to be associated with this package.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="CustomerReferenceType" type="ns:CustomerReferenceType">            
-          </xs:element>
-          <xs:element name="Value" type="xs:string"/>
+          <xs:element name="CustomerReferenceType" type="ns:CustomerReferenceType" minOccurs="1"/>
+          <xs:element name="Value" type="xs:string" minOccurs="1"/>
         </xs:sequence>
       </xs:complexType>
-      <xs:simpleType name="CustomerReferenceType">        
+      <xs:simpleType name="CustomerReferenceType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="BILL_OF_LADING"/>
           <xs:enumeration value="CUSTOMER_REFERENCE"/>
           <xs:enumeration value="DEPARTMENT_NUMBER"/>
           <xs:enumeration value="ELECTRONIC_PRODUCT_CODE"/>
-		  <xs:enumeration value="INTRACOUNTRY_REGULATORY_REFERENCE"/>
+          <xs:enumeration value="INTRACOUNTRY_REGULATORY_REFERENCE"/>
           <xs:enumeration value="INVOICE_NUMBER"/>
+          <xs:enumeration value="PACKING_SLIP_NUMBER"/>
           <xs:enumeration value="P_O_NUMBER"/>
           <xs:enumeration value="SHIPMENT_INTEGRITY"/>
           <xs:enumeration value="STORE_NUMBER"/>
@@ -919,6 +914,11 @@
               <xs:documentation>Controls which data/sections will be suppressed.</xs:documentation>
             </xs:annotation>
           </xs:element>
+          <xs:element name="SecondaryBarcode" type="ns:SecondaryBarcodeType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>For customers producing their own Ground labels, this field specifies which secondary barcode will be printed on the label; so that the primary barcode produced by FedEx has the corect SCNC.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element name="TermsAndConditionsLocalization" type="ns:Localization" minOccurs="0">
             <xs:annotation>
               <xs:documentation>The language to use when printing the terms and conditions on the label.</xs:documentation>
@@ -936,7 +936,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="CustomsClearanceDetail">
+      <xs:complexType name="CustomsClearanceDetail">
         <xs:sequence>
           <xs:element name="Broker" type="ns:Party" minOccurs="0">
             <xs:annotation>
@@ -986,7 +986,7 @@
               <xs:documentation>The total customs value for the shipment. This total will rrepresent th esum of the values of all commodities, and may include freight, miscellaneous, and insurance charges. Must contain 2 explicit decimal positions with a max length of 17 including the decimal. For Express International MPS, the Total Customs Value is in the master transaction and all child transactions</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="FreightOnValue" type="ns:FreightOnValueType" minOccurs="0">
+          <xs:element name="FreightOnValue" type="ns:FreightOnValueType" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Identifies responsibilities with respect to loss, damage, etc.</xs:documentation>
             </xs:annotation>
@@ -996,7 +996,7 @@
               <xs:documentation>Documents amount paid to third party for coverage of shipment content.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="PartiesToTransactionAreRelated" type="xs:boolean" minOccurs="0"/>
+          <xs:element name="PartiesToTransactionAreRelated" type="xs:boolean" minOccurs="0"/>
           <xs:element name="CommercialInvoice" type="ns:CommercialInvoice" minOccurs="0">
             <xs:annotation>
               <xs:documentation>CommercialInvoice element is required for electronic upload of CI data. It will serve to create/transmit an Electronic Commercial Invoice through FedEx System. Customers are responsible for printing their own Commercial Invoice. Commercial Invoice support consists of a maximum of 20 commodity line items.</xs:documentation>
@@ -1022,7 +1022,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="DangerousGoodsAccessibilityType">
+      <xs:simpleType name="DangerousGoodsAccessibilityType">
         <xs:annotation>
           <xs:documentation>Identifies whether or not the products being shipped are required to be accessible during delivery.</xs:documentation>
         </xs:annotation>
@@ -1031,7 +1031,7 @@
           <xs:enumeration value="INACCESSIBLE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="DangerousGoodsDetail">
+      <xs:complexType name="DangerousGoodsDetail">
         <xs:annotation>
           <xs:documentation>The descriptive data required for a FedEx shipment containing dangerous goods (hazardous materials).</xs:documentation>
         </xs:annotation>
@@ -1065,18 +1065,21 @@
             <xs:annotation>
               <xs:documentation>Telephone number to use for contact in the event of an emergency.</xs:documentation>
             </xs:annotation>
-          </xs:element>		  
+          </xs:element>
+          <xs:element name="Offeror" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Offeror's name or contract number, per DOT regulation.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="DateRange">
+      <xs:complexType name="DateRange">
         <xs:sequence>
-          <xs:element name="Begins" type="xs:date">
-          </xs:element>
-          <xs:element name="Ends" type="xs:date">
-          </xs:element>
+          <xs:element name="Begins" type="xs:date" minOccurs="1"/>
+          <xs:element name="Ends" type="xs:date" minOccurs="1"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="DayOfWeekType">
+      <xs:simpleType name="DayOfWeekType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="FRI"/>
           <xs:enumeration value="MON"/>
@@ -1087,7 +1090,7 @@
           <xs:enumeration value="WED"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="DelayDetail">
+      <xs:complexType name="DelayDetail">
         <xs:annotation>
           <xs:documentation>Information about why a shipment delivery is delayed and at what level( country/service etc.).</xs:documentation>
         </xs:annotation>
@@ -1146,7 +1149,7 @@
           <xs:enumeration value="PROOF_OF_DELIVERY_POINT"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="DestinationControlDetail">
+      <xs:complexType name="DestinationControlDetail">
         <xs:annotation>
           <xs:documentation>Data required to complete the Destionation Control Statement for US exports.</xs:documentation>
         </xs:annotation>
@@ -1173,30 +1176,18 @@
           <xs:enumeration value="DEPARTMENT_OF_STATE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Dimensions">
+      <xs:complexType name="Dimensions">
         <xs:annotation>
           <xs:documentation>The dimensions of this package and the unit type used for the measurements.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="Length" minOccurs="1">
-            <xs:simpleType>
-              <xs:restriction base="xs:nonNegativeInteger"/>
-            </xs:simpleType>
-          </xs:element>
-          <xs:element name="Width" minOccurs="1">
-            <xs:simpleType>
-              <xs:restriction base="xs:nonNegativeInteger"/>
-            </xs:simpleType>
-          </xs:element>
-          <xs:element name="Height" minOccurs="1">
-            <xs:simpleType>
-              <xs:restriction base="xs:nonNegativeInteger"/>
-            </xs:simpleType>
-          </xs:element>
+          <xs:element name="Length" type="xs:nonNegativeInteger" minOccurs="1"/>
+          <xs:element name="Width" type="xs:nonNegativeInteger" minOccurs="1"/>
+          <xs:element name="Height" type="xs:nonNegativeInteger" minOccurs="1"/>
           <xs:element name="Units" type="ns:LinearUnits" minOccurs="1"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="Distance">
+      <xs:complexType name="Distance">
         <xs:annotation>
           <xs:documentation>Driving or other transportation distances, distinct from dimension measurements.</xs:documentation>
         </xs:annotation>
@@ -1219,7 +1210,7 @@
           <xs:enumeration value="MI"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="DocTabContent">
+      <xs:complexType name="DocTabContent">
         <xs:sequence>
           <xs:element name="DocTabContentType" type="ns:DocTabContentType" minOccurs="0">
             <xs:annotation>
@@ -1292,7 +1283,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="DropoffType">
+      <xs:simpleType name="DropoffType">
         <xs:annotation>
           <xs:documentation>Identifies the method by which the package is to be tendered to FedEx. This element does not dispatch a courier for package pickup.</xs:documentation>
         </xs:annotation>
@@ -1304,12 +1295,12 @@
           <xs:enumeration value="STATION"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="EMailLabelDetail">
+      <xs:complexType name="EMailLabelDetail">
         <xs:annotation>
           <xs:documentation>Specific information about the delivery of the email and options for the shipment.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="NotificationEMailAddress" type="xs:string">
+          <xs:element name="NotificationEMailAddress" type="xs:string" minOccurs="1">
             <xs:annotation>
               <xs:documentation>Email address to send the URL to.</xs:documentation>
             </xs:annotation>
@@ -1321,7 +1312,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="EMailNotificationDetail">
+      <xs:complexType name="EMailNotificationDetail">
         <xs:annotation>
           <xs:documentation>Information describing email notifications that will be sent in relation to events that occur during package movement</xs:documentation>
         </xs:annotation>
@@ -1329,9 +1320,6 @@
           <xs:element name="PersonalMessage" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>A message that will be included in the email notifications</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>120</xs:MaxLength>
-              </xs:appinfo>
             </xs:annotation>
           </xs:element>
           <xs:element name="Recipients" type="ns:EMailNotificationRecipient" minOccurs="0" maxOccurs="6">
@@ -1341,9 +1329,17 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="EMailNotificationFormatType">
+      <xs:simpleType name="EMailNotificationEventType">
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="ON_DELIVERY"/>
+          <xs:enumeration value="ON_EXCEPTION"/>
+          <xs:enumeration value="ON_SHIPMENT"/>
+          <xs:enumeration value="ON_TENDER"/>
+        </xs:restriction>
+      </xs:simpleType>
+      <xs:simpleType name="EMailNotificationFormatType">
         <xs:annotation>
-          <xs:documentation>The format of the email.</xs:documentation>
+          <xs:documentation>The format of the email</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="HTML"/>
@@ -1356,35 +1352,19 @@
           <xs:documentation>The descriptive data for a FedEx email notification recipient.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="EMailNotificationRecipientType" type="ns:EMailNotificationRecipientType">
+          <xs:element name="EMailNotificationRecipientType" type="ns:EMailNotificationRecipientType" minOccurs="1">
             <xs:annotation>
               <xs:documentation>Identifies the relationship this email recipient has to the shipment.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="EMailAddress" type="xs:string">
+          <xs:element name="EMailAddress" type="xs:string" minOccurs="1">
             <xs:annotation>
               <xs:documentation>The email address to send the notification to</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>
-                  <ns:Express>120</ns:Express>
-                  <ns:Ground>35</ns:Ground>
-                </xs:MaxLength>
-              </xs:appinfo>
             </xs:annotation>
           </xs:element>
-          <xs:element name="NotifyOnShipment" type="xs:boolean" minOccurs="0">
+          <xs:element name="NotificationEventsRequested" type="ns:EMailNotificationEventType" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
-              <xs:documentation>Notify the email recipient when this shipment has been shipped.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="NotifyOnException" type="xs:boolean" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Notify the email recipient if this shipment encounters a problem while in route</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="NotifyOnDelivery" type="xs:boolean" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Notify the email recipient when this shipment has been delivered.</xs:documentation>
+              <xs:documentation>The types of email notifications being requested for this recipient.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="Format" type="ns:EMailNotificationFormatType" minOccurs="0">
@@ -1410,7 +1390,7 @@
           <xs:enumeration value="SHIPPER"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="EdtCommodityTax">
+      <xs:complexType name="EdtCommodityTax">
         <xs:sequence>
           <xs:element name="HarmonizedCode" type="xs:string" minOccurs="0"/>
           <xs:element name="Taxes" type="ns:EdtTaxDetail" minOccurs="0" maxOccurs="unbounded"/>
@@ -1465,7 +1445,7 @@
           <xs:enumeration value="TRANSPORT_FACILITIES_TAX"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="EtdDetail">
+      <xs:complexType name="EtdDetail">
         <xs:annotation>
           <xs:documentation>Electronic Trade document references used with the ETD special service.</xs:documentation>
         </xs:annotation>
@@ -1483,7 +1463,7 @@
           <xs:element name="DocumentReferences" type="ns:UploadDocumentReferenceDetail" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="ExportDetail">
+      <xs:complexType name="ExportDetail">
         <xs:annotation>
           <xs:documentation>Country specific details of an International shipment.</xs:documentation>
         </xs:annotation>
@@ -1498,16 +1478,7 @@
           </xs:element>
           <xs:element name="ExportComplianceStatement" type="xs:string" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>
-                Required only if B13AFilingOption is one of the following:
-                FILED_ELECTRONICALLY
-                MANUALLY_ATTACHED
-                SUMMARY_REPORTING
-                If B13AFilingOption = NOT_REQUIRED, this field should contain a valid B13A Exception Number.
-              </xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>50</xs:MaxLength>
-              </xs:appinfo>
+              <xs:documentation>General field for exporting-country-specific export data (e.g. B13A for CA, FTSR Exemption or AES Citation for US).</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="PermitNumber" type="xs:string" minOccurs="0">
@@ -1525,7 +1496,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="ExpressFreightDetail">
+      <xs:complexType name="ExpressFreightDetail">
         <xs:annotation>
           <xs:documentation>Details specific to an Express freight shipment.</xs:documentation>
         </xs:annotation>
@@ -1575,11 +1546,11 @@
           <xs:documentation>Currently not supported. Delivery contact information for an Express freight shipment.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-		  <xs:element name="Name" type="xs:string" minOccurs="0"/>
+          <xs:element name="Name" type="xs:string" minOccurs="0"/>
           <xs:element name="Phone" type="xs:string" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="ExpressRegionCode">
+      <xs:simpleType name="ExpressRegionCode">
         <xs:annotation>
           <xs:documentation>Indicates a FedEx Express operating region.</xs:documentation>
         </xs:annotation>
@@ -1591,7 +1562,7 @@
           <xs:enumeration value="US"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="FedExLocationType">
+      <xs:simpleType name="FedExLocationType">
         <xs:annotation>
           <xs:documentation>Identifies a kind of FedEx facility.</xs:documentation>
         </xs:annotation>
@@ -1601,7 +1572,7 @@
           <xs:enumeration value="FEDEX_OFFICE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="FlatbedTrailerDetail">
+      <xs:complexType name="FlatbedTrailerDetail">
         <xs:annotation>
           <xs:documentation>Specifies the optional features/characteristics requested for a Freight shipment utilizing a flatbed trailer.</xs:documentation>
         </xs:annotation>
@@ -1621,7 +1592,7 @@
           <xs:enumeration value="PREPAID"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="FreightBaseCharge">
+      <xs:complexType name="FreightBaseCharge">
         <xs:annotation>
           <xs:documentation>Individual charge which contributes to the total base charge for the shipment.</xs:documentation>
         </xs:annotation>
@@ -1669,12 +1640,15 @@
         </xs:sequence>
       </xs:complexType>
       <xs:simpleType name="FreightBaseChargeCalculationType">
+        <xs:annotation>
+          <xs:documentation>Specifies the way in which base charges for a Freight shipment or shipment leg are calculated.</xs:documentation>
+        </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="LINE_ITEMS"/>
           <xs:enumeration value="UNIT_PRICING"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="FreightChargeBasisType">
+      <xs:simpleType name="FreightChargeBasisType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="CWT"/>
           <xs:enumeration value="FLAT"/>
@@ -1706,7 +1680,7 @@
           <xs:enumeration value="CLASS_500"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="FreightCommitDetail">
+      <xs:complexType name="FreightCommitDetail">
         <xs:annotation>
           <xs:documentation>Information about the Freight Service Centers associated with this shipment.</xs:documentation>
         </xs:annotation>
@@ -1736,21 +1710,15 @@
               <xs:documentation>Date for all Freight guarantee types.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="Time" type="xs:time" minOccurs="0">
-            <xs:annotation>
-              <xs:documentation>Time for GUARANTEED_TIME only.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
         </xs:sequence>
       </xs:complexType>
       <xs:simpleType name="FreightGuaranteeType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="GUARANTEED_DATE"/>
           <xs:enumeration value="GUARANTEED_MORNING"/>
-          <xs:enumeration value="GUARANTEED_TIME"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="FreightOnValueType">
+      <xs:simpleType name="FreightOnValueType">
         <xs:annotation>
           <xs:documentation>Identifies responsibilities with respect to loss, damage, etc.</xs:documentation>
         </xs:annotation>
@@ -1769,9 +1737,9 @@
               <xs:documentation>A unique identifier for a specific rate quotation.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="BaseChargeCalculation" type="ns:FreightBaseChargeCalculationType" minOccurs="0">
+          <xs:element name="BaseChargeCalculation" type="ns:FreightBaseChargeCalculationType" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Specifies the way in which base charges for a Freight shipment are calculated.</xs:documentation>
+              <xs:documentation>Specifies how total base charge is determined.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="BaseCharges" type="ns:FreightBaseCharge" minOccurs="0" maxOccurs="unbounded">
@@ -1803,7 +1771,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="FreightServiceCenterDetail">
+      <xs:complexType name="FreightServiceCenterDetail">
         <xs:annotation>
           <xs:documentation>This class describes the relationship between a customer-specified address and the FedEx Freight / FedEx National Freight Service Center that supports that address.</xs:documentation>
         </xs:annotation>
@@ -1833,7 +1801,7 @@
               <xs:documentation>Distance between customer address (pickup or delivery) and the supporting Freight / National Freight service center.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="LocalDuration" type="xs:string" minOccurs="0">
+          <xs:element name="LocalDuration" type="xs:duration" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Time to travel between customer address (pickup or delivery) and the supporting Freight / National Freight service center.</xs:documentation>
             </xs:annotation>
@@ -1853,12 +1821,12 @@
               <xs:documentation>Freight service center that is a gateway on the border of Canada or Mexico.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="Location" minOccurs="0" type="xs:string">
+          <xs:element name="Location" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Alphabetical code identifying a Freight Service Center</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="ContactAndAddress" minOccurs="0" type="ns:ContactAndAddress">
+          <xs:element name="ContactAndAddress" type="ns:ContactAndAddress" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Freight service center Contact and Address</xs:documentation>
             </xs:annotation>
@@ -1963,7 +1931,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="FreightShipmentLineItem">
+      <xs:complexType name="FreightShipmentLineItem">
         <xs:annotation>
           <xs:documentation>Description of an individual commodity or class of content in a shipment.</xs:documentation>
         </xs:annotation>
@@ -2027,7 +1995,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="GeneralAgencyAgreementDetail">
+      <xs:complexType name="GeneralAgencyAgreementDetail">
         <xs:annotation>
           <xs:documentation>Data required to produce a General Agency Agreement document. Remaining content (business data) to be defined once requirements have been completed.</xs:documentation>
         </xs:annotation>
@@ -2035,7 +2003,7 @@
           <xs:element name="Format" type="ns:ShippingDocumentFormat" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="HazardousCommodityContent">
+      <xs:complexType name="HazardousCommodityContent">
         <xs:annotation>
           <xs:documentation>Documents the kind and quantity of an individual hazardous commodity in a package.</xs:documentation>
         </xs:annotation>
@@ -2158,7 +2126,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="HoldAtLocationDetail">
+      <xs:complexType name="HoldAtLocationDetail">
         <xs:annotation>
           <xs:documentation>Descriptive data required for a FedEx shipment that is to be held at the destination FedEx location for pickup by the recipient.</xs:documentation>
         </xs:annotation>
@@ -2166,14 +2134,11 @@
           <xs:element name="PhoneNumber" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Contact phone number for recipient of shipment.</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>15</xs:MaxLength>
-              </xs:appinfo>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="LocationContactAndAddress" type="ns:ContactAndAddress" minOccurs="0">
+          <xs:element name="LocationContactAndAddress" type="ns:ContactAndAddress" minOccurs="0">
             <xs:annotation>
-			  <xs:documentation>Contact and address of FedEx facility at which shipment is to be held.</xs:documentation>
+              <xs:documentation>Contact and address of FedEx facility at which shipment is to be held.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="LocationType" type="ns:FedExLocationType" minOccurs="0">
@@ -2181,25 +2146,24 @@
               <xs:documentation>Type of facility at which package/shipment is to be held.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="LocationId" type="xs:string" minOccurs="0">
+          <xs:element name="LocationId" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Location identification (for facilities identified by an alphanumeric location code).</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="LocationNumber" type="xs:int" minOccurs="0">
+          <xs:element name="LocationNumber" type="xs:int" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Location identification (for facilities identified by an numeric location code).</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="HomeDeliveryPremiumDetail">
+      <xs:complexType name="HomeDeliveryPremiumDetail">
         <xs:annotation>
           <xs:documentation>The descriptive data required by FedEx for home delivery services.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="HomeDeliveryPremiumType" type="ns:HomeDeliveryPremiumType" minOccurs="1">            
-          </xs:element>
+          <xs:element name="HomeDeliveryPremiumType" type="ns:HomeDeliveryPremiumType" minOccurs="1"/>
           <xs:element name="Date" type="xs:date" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Required for Date Certain Home Delivery.</xs:documentation>
@@ -2222,7 +2186,7 @@
           <xs:enumeration value="EVENING"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="ImageId">
+      <xs:simpleType name="ImageId">
         <xs:restriction base="xs:string">
           <xs:enumeration value="IMAGE_1"/>
           <xs:enumeration value="IMAGE_2"/>
@@ -2231,7 +2195,7 @@
           <xs:enumeration value="IMAGE_5"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="InternationalDocumentContentType">
+      <xs:simpleType name="InternationalDocumentContentType">
         <xs:annotation>
           <xs:documentation>The type of International shipment.</xs:documentation>
         </xs:annotation>
@@ -2240,7 +2204,7 @@
           <xs:enumeration value="NON_DOCUMENTS"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="LabelFormatType">
+      <xs:simpleType name="LabelFormatType">
         <xs:annotation>
           <xs:documentation>Specifies the type of label to be returned.</xs:documentation>
         </xs:annotation>
@@ -2249,6 +2213,7 @@
           <xs:enumeration value="LABEL_DATA_ONLY"/>
           <xs:enumeration value="MAILROOM"/>
           <xs:enumeration value="NO_LABEL"/>
+          <xs:enumeration value="OPERATIONAL_LABEL"/>
           <xs:enumeration value="PRE_COMMON2D"/>
         </xs:restriction>
       </xs:simpleType>
@@ -2280,11 +2245,11 @@
       </xs:simpleType>
       <xs:simpleType name="LabelRotationType">
         <xs:annotation>
-          <xs:documentation>Relative to normal orientation for the printer. RIGHT=90 degrees clockwise, UPSIDE_DOWN=180 degrees, LEFT=90 degrees counterclockwise.</xs:documentation>
+          <xs:documentation>Relative to normal orientation for the printer.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-		  <xs:enumeration value="LEFT"/>
-		  <xs:enumeration value="NONE"/>
+          <xs:enumeration value="LEFT"/>
+          <xs:enumeration value="NONE"/>
           <xs:enumeration value="RIGHT"/>
           <xs:enumeration value="UPSIDE_DOWN"/>
         </xs:restriction>
@@ -2357,7 +2322,7 @@
           <xs:enumeration value="STOCK_4X9_TRAILING_DOC_TAB"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="LiabilityCoverageDetail">
+      <xs:complexType name="LiabilityCoverageDetail">
         <xs:sequence>
           <xs:element name="CoverageType" type="ns:LiabilityCoverageType" minOccurs="0"/>
           <xs:element name="CoverageAmount" type="ns:Money" minOccurs="0">
@@ -2373,7 +2338,7 @@
           <xs:enumeration value="USED_OR_RECONDITIONED"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="LinearMeasure">
+      <xs:complexType name="LinearMeasure">
         <xs:annotation>
           <xs:documentation>Represents a one-dimensional measurement in small units (e.g. suitable for measuring a package or document), contrasted with Distance, which represents a large one-dimensional measurement (e.g. distance between cities).</xs:documentation>
         </xs:annotation>
@@ -2390,7 +2355,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="LinearUnits">
+      <xs:simpleType name="LinearUnits">
         <xs:annotation>
           <xs:documentation>CM = centimeters, IN = inches</xs:documentation>
         </xs:annotation>
@@ -2399,12 +2364,12 @@
           <xs:enumeration value="IN"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Localization">
+      <xs:complexType name="Localization">
         <xs:annotation>
           <xs:documentation>Identifies the representation of human-readable text.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="LanguageCode" type="xs:string" minOccurs="0">
+          <xs:element name="LanguageCode" type="xs:string" minOccurs="1">
             <xs:annotation>
               <xs:documentation>Two-letter code for language (e.g. EN, FR, etc.)</xs:documentation>
             </xs:annotation>
@@ -2416,13 +2381,13 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="Measure">
+      <xs:complexType name="Measure">
         <xs:sequence>
           <xs:element name="Quantity" type="xs:decimal" minOccurs="0"/>
           <xs:element name="Units" type="xs:string" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="MinimumChargeType">
+      <xs:simpleType name="MinimumChargeType">
         <xs:annotation>
           <xs:documentation>Internal FedEx use only.</xs:documentation>
         </xs:annotation>
@@ -2431,18 +2396,18 @@
           <xs:enumeration value="CUSTOMER_FREIGHT_WEIGHT"/>
           <xs:enumeration value="EARNED_DISCOUNT"/>
           <xs:enumeration value="MIXED"/>
-		  <xs:enumeration value="RATE_SCALE"/>
+          <xs:enumeration value="RATE_SCALE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Money">
+      <xs:complexType name="Money">
         <xs:sequence>
           <xs:element name="Currency" type="xs:string" minOccurs="0"/>
           <xs:element name="Amount" type="xs:decimal" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="NaftaCertificateOfOriginDetail">
+      <xs:complexType name="NaftaCertificateOfOriginDetail">
         <xs:annotation>
-          <xs:documentation>Data required to produce a Certificate of Origin document.</xs:documentation>
+          <xs:documentation>Data required to produce a Certificate of Origin document. Remaining content (business data) to be defined once requirements have been completed.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="Format" type="ns:ShippingDocumentFormat" minOccurs="0"/>
@@ -2462,7 +2427,7 @@
           <xs:element name="CustomerImageUsages" type="ns:CustomerImageUsage" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="NaftaCommodityDetail">
+      <xs:complexType name="NaftaCommodityDetail">
         <xs:sequence>
           <xs:element name="PreferenceCriterion" type="ns:NaftaPreferenceCriterionCode" minOccurs="0">
             <xs:annotation>
@@ -2495,7 +2460,7 @@
           <xs:enumeration value="VARIOUS"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="NaftaNetCostMethodCode">
+      <xs:simpleType name="NaftaNetCostMethodCode">
         <xs:annotation>
           <xs:documentation>
             Net cost method used.
@@ -2506,7 +2471,7 @@
           <xs:enumeration value="NO"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="NaftaPreferenceCriterionCode">
+      <xs:simpleType name="NaftaPreferenceCriterionCode">
         <xs:annotation>
           <xs:documentation>See instructions for NAFTA Certificate of Origin for code definitions.</xs:documentation>
         </xs:annotation>
@@ -2519,13 +2484,13 @@
           <xs:enumeration value="F"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="NaftaProducer">
+      <xs:complexType name="NaftaProducer">
         <xs:sequence>
           <xs:element name="Id" type="xs:string" minOccurs="0"/>
           <xs:element name="Producer" type="ns:Party" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="NaftaProducerDeterminationCode">
+      <xs:simpleType name="NaftaProducerDeterminationCode">
         <xs:annotation>
           <xs:documentation>See instructions for NAFTA Certificate of Origin for code definitions.</xs:documentation>
         </xs:annotation>
@@ -2545,7 +2510,7 @@
           <xs:enumeration value="UNKNOWN"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Notification">
+      <xs:complexType name="Notification">
         <xs:annotation>
           <xs:documentation>The descriptive data regarding the result of the submitted transaction.</xs:documentation>
         </xs:annotation>
@@ -2563,17 +2528,11 @@
           <xs:element name="Code" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>A code that represents this notification. Combined with the Source it uniquely identifies this notification.</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>8</xs:MaxLength>
-              </xs:appinfo>
             </xs:annotation>
           </xs:element>
           <xs:element name="Message" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Human-readable text that explains this notification.</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>255</xs:MaxLength>
-              </xs:appinfo>
             </xs:annotation>
           </xs:element>
           <xs:element name="LocalizedMessage" type="xs:string" minOccurs="0">
@@ -2609,12 +2568,12 @@
         <xs:restriction base="xs:string">
           <xs:enumeration value="ERROR"/>
           <xs:enumeration value="FAILURE"/>
-		  <xs:enumeration value="NOTE"/>
-		  <xs:enumeration value="SUCCESS"/>
+          <xs:enumeration value="NOTE"/>
+          <xs:enumeration value="SUCCESS"/>
           <xs:enumeration value="WARNING"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Op900Detail">
+      <xs:complexType name="Op900Detail">
         <xs:annotation>
           <xs:documentation>The instructions indicating how to print the OP-900 form for hazardous materials packages.</xs:documentation>
         </xs:annotation>
@@ -2641,7 +2600,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="OversizeClassType">
+      <xs:simpleType name="OversizeClassType">
         <xs:annotation>
           <xs:documentation>The Oversize classification for a package.</xs:documentation>
         </xs:annotation>
@@ -2651,7 +2610,7 @@
           <xs:enumeration value="OVERSIZE_3"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="PackageRateDetail">
+      <xs:complexType name="PackageRateDetail">
         <xs:annotation>
           <xs:documentation>Data for a package's rates, as calculated per a specific rate type.</xs:documentation>
         </xs:annotation>
@@ -2668,7 +2627,7 @@
           </xs:element>
           <xs:element name="MinimumChargeType" type="ns:MinimumChargeType" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Internal FedEx use only.</xs:documentation>
+              <xs:documentation>INTERNAL FEDEX USE ONLY.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="BillingWeight" type="ns:Weight" minOccurs="0">
@@ -2753,13 +2712,14 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="PackageSpecialServiceType">
+      <xs:simpleType name="PackageSpecialServiceType">
         <xs:annotation>
           <xs:documentation>Identifies the collection of special services offered by FedEx.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
+          <xs:enumeration value="ALCOHOL"/>
           <xs:enumeration value="APPOINTMENT_DELIVERY"/>
-		  <xs:enumeration value="COD"/>
+          <xs:enumeration value="COD"/>
           <xs:enumeration value="DANGEROUS_GOODS"/>
           <xs:enumeration value="DRY_ICE"/>
           <xs:enumeration value="NON_STANDARD_CONTAINER"/>
@@ -2767,7 +2727,7 @@
           <xs:enumeration value="SIGNATURE_OPTION"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="PackageSpecialServicesRequested">
+      <xs:complexType name="PackageSpecialServicesRequested">
         <xs:annotation>
           <xs:documentation>These special services are available at the package level for some or all service types. If the shipper is requesting a special service which requires additional data, the package special service type must be present in the specialServiceTypes collection, and the supporting detail must be provided in the appropriate sub-object below.</xs:documentation>
         </xs:annotation>
@@ -2777,7 +2737,7 @@
               <xs:documentation>The types of all special services requested for the enclosing shipment or package.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="CodDetail" type="ns:CodDetail" minOccurs="0">
+          <xs:element name="CodDetail" type="ns:CodDetail" minOccurs="0">
             <xs:annotation>
               <xs:documentation>For use with FedEx Ground services only; COD must be present in shipment's special services.</xs:documentation>
             </xs:annotation>
@@ -2804,7 +2764,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="PackagingType">
+      <xs:simpleType name="PackagingType">
         <xs:annotation>
           <xs:documentation>Identifies the packaging used by the requestor for the package. See PackagingType for list of valid enumerated values.</xs:documentation>
         </xs:annotation>
@@ -2818,7 +2778,7 @@
           <xs:enumeration value="YOUR_PACKAGING"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Party">
+      <xs:complexType name="Party">
         <xs:annotation>
           <xs:documentation>The descriptive data for a person or company entitiy doing business with FedEx.</xs:documentation>
         </xs:annotation>
@@ -2831,7 +2791,7 @@
               </xs:appinfo>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="Tins" type="ns:TaxpayerIdentification" minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="Tins" type="ns:TaxpayerIdentification" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
               <xs:documentation>Descriptive data for taxpayer identification information.</xs:documentation>
             </xs:annotation>
@@ -2848,7 +2808,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="Payment">
+      <xs:complexType name="Payment">
         <xs:annotation>
           <xs:documentation>The descriptive data for the monetary compensation given to FedEx for services rendered to the customer.</xs:documentation>
         </xs:annotation>
@@ -2893,14 +2853,13 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="PendingShipmentDetail">
+      <xs:complexType name="PendingShipmentDetail">
         <xs:annotation>
           <xs:documentation>This information describes the kind of pending shipment being requested.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="Type" type="ns:PendingShipmentType">
-          </xs:element>
-          <xs:element name="ExpirationDate" type="xs:dateTime" minOccurs="0">
+          <xs:element name="Type" type="ns:PendingShipmentType" minOccurs="1"/>
+          <xs:element name="ExpirationDate" type="xs:date" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Date after which the pending shipment will no longer be available for completion.</xs:documentation>
             </xs:annotation>
@@ -2947,7 +2906,7 @@
           <xs:enumeration value="TUBE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="PickupDetail">
+      <xs:complexType name="PickupDetail">
         <xs:annotation>
           <xs:documentation>This class describes the pickup characteristics of a shipment (e.g. for use in a tag request).</xs:documentation>
         </xs:annotation>
@@ -2959,19 +2918,19 @@
           <xs:element name="RequestSource" type="ns:PickupRequestSourceType" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="PickupRequestSourceType">
+      <xs:simpleType name="PickupRequestSourceType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="AUTOMATION"/>
           <xs:enumeration value="CUSTOMER_SERVICE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="PickupRequestType">
+      <xs:simpleType name="PickupRequestType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="FUTURE_DAY"/>
-		  <xs:enumeration value="SAME_DAY"/>
+          <xs:enumeration value="SAME_DAY"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="PricingCodeType">
+      <xs:simpleType name="PricingCodeType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="ACTUAL"/>
           <xs:enumeration value="ALTERNATE"/>
@@ -2988,7 +2947,7 @@
           <xs:enumeration value="SPECIAL"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="PriorityAlertDetail">
+      <xs:complexType name="PriorityAlertDetail">
         <xs:annotation>
           <xs:documentation>Currently not supported.</xs:documentation>
         </xs:annotation>
@@ -2996,7 +2955,7 @@
           <xs:element name="Content" type="xs:string" minOccurs="0" maxOccurs="3"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="PurposeOfShipmentType">
+      <xs:simpleType name="PurposeOfShipmentType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="GIFT"/>
           <xs:enumeration value="NOT_SOLD"/>
@@ -3006,9 +2965,9 @@
           <xs:enumeration value="SOLD"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="RateDimensionalDivisorType">
+      <xs:simpleType name="RateDimensionalDivisorType">
         <xs:annotation>
-          <xs:documentation>Identifies the type of dim divisor that was applied.</xs:documentation>
+          <xs:documentation>Indicates the reason that a dim divisor value was chose.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="COUNTRY"/>
@@ -3018,7 +2977,7 @@
           <xs:enumeration value="WAIVED"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="RateDiscount">
+      <xs:complexType name="RateDiscount">
         <xs:annotation>
           <xs:documentation>Identifies a discount applied to the shipment.</xs:documentation>
         </xs:annotation>
@@ -3047,13 +3006,24 @@
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="BONUS"/>
-		  <xs:enumeration value="COUPON"/>
+          <xs:enumeration value="COUPON"/>
           <xs:enumeration value="EARNED"/>
           <xs:enumeration value="OTHER"/>
           <xs:enumeration value="VOLUME"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="RateReply">
+      <xs:simpleType name="RateElementBasisType">
+        <xs:annotation>
+          <xs:documentation>Selects the value from a set of rate data to which the percentage is applied.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="BASE_CHARGE"/>
+          <xs:enumeration value="NET_CHARGE"/>
+          <xs:enumeration value="NET_CHARGE_EXCLUDING_TAXES"/>
+          <xs:enumeration value="NET_FREIGHT"/>
+        </xs:restriction>
+      </xs:simpleType>
+      <xs:complexType name="RateReply">
         <xs:annotation>
           <xs:documentation>The response to a RateRequest. The Notifications indicate whether the request was successful or not.</xs:documentation>
         </xs:annotation>
@@ -3073,7 +3043,7 @@
               <xs:documentation>Contains the CustomerTransactionId that was sent in the request.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="Version" type="ns:VersionId">
+          <xs:element name="Version" type="ns:VersionId" minOccurs="1">
             <xs:annotation>
               <xs:documentation>The version of this reply.</xs:documentation>
             </xs:annotation>
@@ -3136,9 +3106,9 @@
               <xs:documentation>Time in transit from pickup to delivery.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="MaximumTransitTime" type="ns:TransitTimeType" minOccurs="0">
+          <xs:element name="MaximumTransitTime" type="ns:TransitTimeType" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Maximum expected transit time.</xs:documentation>
+              <xs:documentation>Maximum expected transit time</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="SignatureOption" type="ns:SignatureOptionType" minOccurs="0">
@@ -3158,7 +3128,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="RateRequest">
+      <xs:complexType name="RateRequest">
         <xs:annotation>
           <xs:documentation>Descriptive data sent to FedEx by a customer in order to rate a package/shipment.</xs:documentation>
         </xs:annotation>
@@ -3178,7 +3148,7 @@
               <xs:documentation>Descriptive data for this customer transaction. The TransactionDetail from the request is echoed back to the caller in the corresponding reply.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="Version" type="ns:VersionId">
+          <xs:element name="Version" type="ns:VersionId" minOccurs="1">
             <xs:annotation>
               <xs:documentation>Identifies the version/level of a service operation expected by a caller (in each request) and performed by the callee (in each reply).</xs:documentation>
             </xs:annotation>
@@ -3198,14 +3168,14 @@
               <xs:documentation>Contains zero or more service options whose combinations are to be considered when replying with available services.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="RequestedShipment" type="ns:RequestedShipment">
+          <xs:element name="RequestedShipment" type="ns:RequestedShipment" minOccurs="1">
             <xs:annotation>
               <xs:documentation>The shipment for which a rate quote (or rate-shopping comparison) is desired.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="RateRequestType">
+      <xs:simpleType name="RateRequestType">
         <xs:annotation>
           <xs:documentation>Indicates the type of rates to be returned.</xs:documentation>
         </xs:annotation>
@@ -3214,7 +3184,16 @@
           <xs:enumeration value="LIST"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="RatedPackageDetail">
+      <xs:simpleType name="RateTypeBasisType">
+        <xs:annotation>
+          <xs:documentation>Select the type of rate from which the element is to be selected.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="ACCOUNT"/>
+          <xs:enumeration value="LIST"/>
+        </xs:restriction>
+      </xs:simpleType>
+      <xs:complexType name="RatedPackageDetail">
         <xs:annotation>
           <xs:documentation>If requesting rates using the PackageDetails element (one package at a time) in the request, the rates for each package will be returned in this element. Currently total piece total weight rates are also retuned in this element.</xs:documentation>
         </xs:annotation>
@@ -3236,7 +3215,7 @@
           </xs:element>
           <xs:element name="AdjustedCodCollectionAmount" type="ns:Money" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Ground COD is package level.</xs:documentation>
+              <xs:documentation>Ground COD is shipment level.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="OversizeClass" type="ns:OversizeClassType" minOccurs="0"/>
@@ -3247,7 +3226,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="RatedShipmentDetail">
+      <xs:complexType name="RatedShipmentDetail">
         <xs:annotation>
           <xs:documentation>This class groups the shipment and package rating data for a specific rate type for use in a rating reply, which groups result data by rate type.</xs:documentation>
         </xs:annotation>
@@ -3259,7 +3238,7 @@
           </xs:element>
           <xs:element name="AdjustedCodCollectionAmount" type="ns:Money" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Ground COD is package level.</xs:documentation>
+              <xs:documentation>Express COD is shipment level.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="ShipmentRateDetail" type="ns:ShipmentRateDetail" minOccurs="0">
@@ -3274,26 +3253,26 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="RatedWeightMethod">
+      <xs:simpleType name="RatedWeightMethod">
         <xs:annotation>
           <xs:documentation>The method used to calculate the weight to be used in rating the package..</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="ACTUAL"/>
           <xs:enumeration value="AVERAGE_PACKAGE_WEIGHT_MINIMUM"/>
-		  <xs:enumeration value="BALLOON"/>
+          <xs:enumeration value="BALLOON"/>
           <xs:enumeration value="DIM"/>
           <xs:enumeration value="FREIGHT_MINIMUM"/>
           <xs:enumeration value="MIXED"/>
           <xs:enumeration value="OVERSIZE"/>
-		  <xs:enumeration value="OVERSIZE_1"/>
+          <xs:enumeration value="OVERSIZE_1"/>
           <xs:enumeration value="OVERSIZE_2"/>
           <xs:enumeration value="OVERSIZE_3"/>
           <xs:enumeration value="PACKAGING_MINIMUM"/>
           <xs:enumeration value="WEIGHT_BREAK"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Rebate">
+      <xs:complexType name="Rebate">
         <xs:annotation>
           <xs:documentation>Identifies a discount applied to the shipment.</xs:documentation>
         </xs:annotation>
@@ -3318,11 +3297,11 @@
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="BONUS"/>
-		  <xs:enumeration value="EARNED"/>
+          <xs:enumeration value="EARNED"/>
           <xs:enumeration value="OTHER"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="RecipientCustomsId">
+      <xs:complexType name="RecipientCustomsId">
         <xs:annotation>
           <xs:documentation>Specifies how the recipient is identified for customs purposes; the requirements on this information vary with destination country.</xs:documentation>
         </xs:annotation>
@@ -3339,7 +3318,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="RecipientCustomsIdType">
+      <xs:simpleType name="RecipientCustomsIdType">
         <xs:annotation>
           <xs:documentation>Type of Brazilian taxpayer identifier provided in Recipient/TaxPayerIdentification/Number. For shipments bound for Brazil this overrides the value in Recipient/TaxPayerIdentification/TinType</xs:documentation>
         </xs:annotation>
@@ -3349,7 +3328,7 @@
           <xs:enumeration value="PASSPORT"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="RegulatoryControlType">
+      <xs:simpleType name="RegulatoryControlType">
         <xs:annotation>
           <xs:documentation>FOOD_OR_PERISHABLE is required by FDA/BTA; must be true for food/perishable items coming to US or PR from non-US/non-PR origin</xs:documentation>
         </xs:annotation>
@@ -3358,13 +3337,6 @@
           <xs:enumeration value="FOOD_OR_PERISHABLE"/>
           <xs:enumeration value="NAFTA"/>
         </xs:restriction>
-      </xs:simpleType>
-	  <xs:simpleType name="RequestedPackageDetailType">
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="INDIVIDUAL_PACKAGES"/>
-          <xs:enumeration value="PACKAGE_GROUPS"/>
-		  <xs:enumeration value="PACKAGE_SUMMARY"/>
-        </xs:restriction>
       </xs:simpleType>
       <xs:complexType name="RequestedPackageLineItem">
         <xs:annotation>
@@ -3452,12 +3424,12 @@
               <xs:documentation>Total insured amount.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="Shipper" type="ns:Party">
+          <xs:element name="Shipper" type="ns:Party" minOccurs="1">
             <xs:annotation>
               <xs:documentation>Descriptive data identifying the party responsible for shipping the package. Shipper and Origin should have the same address.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="Recipient" type="ns:Party">
+          <xs:element name="Recipient" type="ns:Party" minOccurs="1">
             <xs:annotation>
               <xs:documentation>Descriptive data identifying the party receiving the package.</xs:documentation>
             </xs:annotation>
@@ -3507,7 +3479,7 @@
           </xs:element>
           <xs:element name="CustomsClearanceDetail" type="ns:CustomsClearanceDetail" minOccurs="0">
             <xs:annotation>
-			  <xs:documentation>Customs clearance data, used for both international and intra-country shipping.</xs:documentation>
+              <xs:documentation>Customs clearance data, used for both international and intra-country shipping.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="PickupDetail" type="ns:PickupDetail" minOccurs="0">
@@ -3515,7 +3487,11 @@
               <xs:documentation>For use in "process tag" transaction.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="SmartPostDetail" type="ns:SmartPostShipmentDetail" minOccurs="0"/>
+          <xs:element name="SmartPostDetail" type="ns:SmartPostShipmentDetail" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Specifies the characteristics of a shipment pertaining to SmartPost services.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element name="BlockInsightVisibility" type="xs:boolean" minOccurs="0">
             <xs:annotation>
               <xs:documentation>If true, only the shipper/payor will have visibility of this shipment.</xs:documentation>
@@ -3528,12 +3504,12 @@
           </xs:element>
           <xs:element name="ShippingDocumentSpecification" type="ns:ShippingDocumentSpecification" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Details such as shipping document types, NAFTA information, CI information, and GAA information.</xs:documentation>
+              <xs:documentation>Contains data used to create additional (non-label) shipping documents.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="RateRequestTypes" type="ns:RateRequestType" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
-			  <xs:documentation>Specifies whether and what kind of rates the customer wishes to have quoted on this shipment. The reply will also be constrained by other data on the shipment and customer.</xs:documentation>
+              <xs:documentation>Specifies whether and what kind of rates the customer wishes to have quoted on this shipment. The reply will also be constrained by other data on the shipment and customer.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="EdtRequestType" type="ns:EdtRequestType" minOccurs="0">
@@ -3543,12 +3519,12 @@
           </xs:element>
           <xs:element name="PackageCount" type="xs:nonNegativeInteger" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>For a multiple piece shipment this is the total number of packages in the shipment.</xs:documentation>
+              <xs:documentation>The total number of packages in the entire shipment (even when the shipment spans multiple transactions.)</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="PackageDetail" type="ns:RequestedPackageDetailType" minOccurs="0">
+          <xs:element name="ShipmentOnlyFields" type="ns:ShipmentOnlyFieldsType" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
-              <xs:documentation>Specifies whether packages are described individually, in groups, or summarized in a single description for total-piece-total-weight. This field controls which fields of the RequestedPackageLineItem will be used, and how many occurrences are expected.</xs:documentation>
+              <xs:documentation>Specifies which package-level data values are provided at the shipment-level only. The package-level data values types specified here will not be provided at the package-level.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="RequestedPackageLineItems" type="ns:RequestedPackageLineItem" minOccurs="0" maxOccurs="999">
@@ -3558,35 +3534,19 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="RequestedShippingDocumentType">
+      <xs:simpleType name="RequestedShippingDocumentType">
         <xs:restriction base="xs:string">
-		  <xs:enumeration value="CERTIFICATE_OF_ORIGIN">
-            <xs:annotation>
-              <xs:documentation>Currently not supported.</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-		  <xs:enumeration value="COMMERCIAL_INVOICE">
-            <xs:annotation>
-              <xs:documentation>Currently not supported.</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
+          <xs:enumeration value="CERTIFICATE_OF_ORIGIN"/>
+          <xs:enumeration value="COMMERCIAL_INVOICE"/>
           <xs:enumeration value="CUSTOMER_SPECIFIED_LABELS"/>
           <xs:enumeration value="GENERAL_AGENCY_AGREEMENT"/>
           <xs:enumeration value="LABEL"/>
-          <xs:enumeration value="NAFTA_CERTIFICATE_OF_ORIGIN">
-            <xs:annotation>
-              <xs:documentation>Currently not supported.</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-          <xs:enumeration value="PRO_FORMA_INVOICE">
-            <xs:annotation>
-              <xs:documentation>Currently not supported.</xs:documentation>
-            </xs:annotation>
-          </xs:enumeration>
-		  <xs:enumeration value="RETURN_INSTRUCTIONS"/>
+          <xs:enumeration value="NAFTA_CERTIFICATE_OF_ORIGIN"/>
+          <xs:enumeration value="PRO_FORMA_INVOICE"/>
+          <xs:enumeration value="RETURN_INSTRUCTIONS"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="RequiredShippingDocumentType">
+      <xs:simpleType name="RequiredShippingDocumentType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="CANADIAN_B13A"/>
           <xs:enumeration value="CERTIFICATE_OF_ORIGIN"/>
@@ -3596,7 +3556,7 @@
           <xs:enumeration value="SHIPPERS_EXPORT_DECLARATION"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="ReturnEMailAllowedSpecialServiceType">
+      <xs:simpleType name="ReturnEMailAllowedSpecialServiceType">
         <xs:annotation>
           <xs:documentation>These values are used to control the availability of certain special services at the time when a customer uses the e-mail label link to create a return shipment.</xs:documentation>
         </xs:annotation>
@@ -3605,10 +3565,10 @@
           <xs:enumeration value="SATURDAY_PICKUP"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="ReturnEMailDetail">
+      <xs:complexType name="ReturnEMailDetail">
         <xs:sequence>
           <xs:element name="MerchantPhoneNumber" type="xs:string" minOccurs="0"/>
-          <xs:element name="AllowedSpecialServices" type="ns:ReturnEMailAllowedSpecialServiceType" minOccurs="0">
+          <xs:element name="AllowedSpecialServices" type="ns:ReturnEMailAllowedSpecialServiceType" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
               <xs:documentation>Identifies the allowed (merchant-authorized) special services which may be selected when the subsequent shipment is created. Only services represented in EMailLabelAllowedSpecialServiceType will be controlled by this list.</xs:documentation>
             </xs:annotation>
@@ -3620,7 +3580,7 @@
           <xs:documentation>Information relating to a return shipment.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="ReturnType" type="ns:ReturnType">
+          <xs:element name="ReturnType" type="ns:ReturnType" minOccurs="1">
             <xs:annotation>
               <xs:documentation>The type of return shipment that is being requested. At present the only type of retrun shipment that is supported is PRINT_RETURN_LABEL. With this option you can print a return label to insert into the box of an outbound shipment. This option can not be used to print an outbound label.</xs:documentation>
             </xs:annotation>
@@ -3647,9 +3607,9 @@
           <xs:enumeration value="PRINT_RETURN_LABEL"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="ReturnedRateType">
+      <xs:simpleType name="ReturnedRateType">
         <xs:annotation>
-          <xs:documentation>The "PAYOR..." rates are expressed in the currency identified in the payor's rate table(s). The "RATED..." rates are expressed in the currency of the origin country.</xs:documentation>
+          <xs:documentation>The "PAYOR..." rates are expressed in the currency identified in the payor's rate table(s). The "RATED..." rates are expressed in the currency of the origin country. Former "...COUNTER..." values have become "...RETAIL..." values, except for PAYOR_COUNTER and RATED_COUNTER, which have been removed.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="PAYOR_ACCOUNT_PACKAGE"/>
@@ -3662,7 +3622,7 @@
           <xs:enumeration value="RATED_LIST_SHIPMENT"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Rma">
+      <xs:complexType name="Rma">
         <xs:annotation>
           <xs:documentation>Return Merchant Authorization</xs:documentation>
         </xs:annotation>
@@ -3685,18 +3645,26 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="ServiceOptionType">
+      <xs:simpleType name="SecondaryBarcodeType">
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="COMMON_2D"/>
+          <xs:enumeration value="NONE"/>
+          <xs:enumeration value="SSCC_18"/>
+          <xs:enumeration value="USPS"/>
+        </xs:restriction>
+      </xs:simpleType>
+      <xs:simpleType name="ServiceOptionType">
         <xs:annotation>
           <xs:documentation>These values control the optional features of service that may be combined in a commitment/rate comparision transaction.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="FREIGHT_GUARANTEE"/>
-		  <xs:enumeration value="SATURDAY_DELIVERY"/>
-		  <xs:enumeration value="SMART_POST_ALLOWED_INDICIA"/>
+          <xs:enumeration value="SATURDAY_DELIVERY"/>
+          <xs:enumeration value="SMART_POST_ALLOWED_INDICIA"/>
           <xs:enumeration value="SMART_POST_HUB_ID"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="ServiceSubOptionDetail">
+      <xs:complexType name="ServiceSubOptionDetail">
         <xs:annotation>
           <xs:documentation>Supporting detail for applied options identified in a rate quote.</xs:documentation>
         </xs:annotation>
@@ -3711,14 +3679,14 @@
               <xs:documentation>Identifies the smartPostHubId used during rate quote, if SMART_POST_HUB_ID is a variable option on the rate request.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="SmartPostIndicia" type="ns:SmartPostIndiciaType" minOccurs="0">
+          <xs:element name="SmartPostIndicia" type="ns:SmartPostIndiciaType" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Identifies the indicia used during rate quote, if SMART_POST_ALLOWED_INDICIA is a variable option on the rate request.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="ServiceType">
+      <xs:simpleType name="ServiceType">
         <xs:annotation>
           <xs:documentation>Identifies the FedEx service to use in shipping the package. See ServiceType for list of valid enumerated values.</xs:documentation>
         </xs:annotation>
@@ -3726,18 +3694,19 @@
           <xs:enumeration value="EUROPE_FIRST_INTERNATIONAL_PRIORITY"/>
           <xs:enumeration value="FEDEX_1_DAY_FREIGHT"/>
           <xs:enumeration value="FEDEX_2_DAY"/>
+          <xs:enumeration value="FEDEX_2_DAY_AM"/>
           <xs:enumeration value="FEDEX_2_DAY_FREIGHT"/>
           <xs:enumeration value="FEDEX_3_DAY_FREIGHT"/>
           <xs:enumeration value="FEDEX_EXPRESS_SAVER"/>
-		  <xs:enumeration value="FEDEX_FREIGHT"/>
+          <xs:enumeration value="FEDEX_FIRST_FREIGHT"/>
+          <xs:enumeration value="FEDEX_FREIGHT_ECONOMY"/>
+          <xs:enumeration value="FEDEX_FREIGHT_PRIORITY"/>
           <xs:enumeration value="FEDEX_GROUND"/>
-		  <xs:enumeration value="FEDEX_NATIONAL_FREIGHT"/>
           <xs:enumeration value="FIRST_OVERNIGHT"/>
           <xs:enumeration value="GROUND_HOME_DELIVERY"/>
           <xs:enumeration value="INTERNATIONAL_ECONOMY"/>
           <xs:enumeration value="INTERNATIONAL_ECONOMY_FREIGHT"/>
           <xs:enumeration value="INTERNATIONAL_FIRST"/>
-		  <xs:enumeration value="INTERNATIONAL_GROUND"/>
           <xs:enumeration value="INTERNATIONAL_PRIORITY"/>
           <xs:enumeration value="INTERNATIONAL_PRIORITY_FREIGHT"/>
           <xs:enumeration value="PRIORITY_OVERNIGHT"/>
@@ -3745,9 +3714,9 @@
           <xs:enumeration value="STANDARD_OVERNIGHT"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="ShipmentDryIceDetail">
+      <xs:complexType name="ShipmentDryIceDetail">
         <xs:annotation>
-		  <xs:documentation>Shipment-level totals of dry ice data across all packages.</xs:documentation>
+          <xs:documentation>Shipment-level totals of dry ice data across all packages.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
           <xs:element name="PackageCount" type="xs:nonNegativeInteger" minOccurs="0">
@@ -3762,7 +3731,154 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="ShipmentRateDetail">
+      <xs:complexType name="ShipmentLegRateDetail">
+        <xs:annotation>
+          <xs:documentation>Data for a single leg of a shipment's total/summary rates, as calculated per a specific rate type.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+          <xs:element name="LegDescription" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Human-readable text describing the shipment leg.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="LegOrigin" type="ns:Address" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Origin for this leg.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="LegDestination" type="ns:Address" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Destination for this leg.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="RateType" type="ns:ReturnedRateType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Type used for this specific set of rate data.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="RateScale" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Indicates the rate scale used.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="RateZone" type="xs:string" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Indicates the rate zone used (based on origin and destination).</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="PricingCode" type="ns:PricingCodeType" minOccurs="0"/>
+          <xs:element name="RatedWeightMethod" type="ns:RatedWeightMethod" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Indicates which weight was used.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="MinimumChargeType" type="ns:MinimumChargeType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>INTERNAL FEDEX USE ONLY.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="CurrencyExchangeRate" type="ns:CurrencyExchangeRate" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Specifies the currency exchange performed on financial amounts for this rate.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="SpecialRatingApplied" type="ns:SpecialRatingAppliedType" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>Indicates which special rating cases applied to this shipment.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="DimDivisor" type="xs:nonNegativeInteger" minOccurs="0"/>
+          <xs:element name="DimDivisorType" type="ns:RateDimensionalDivisorType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Identifies the type of dim divisor that was applied.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="FuelSurchargePercent" type="xs:decimal" minOccurs="0"/>
+          <xs:element name="TotalBillingWeight" type="ns:Weight" minOccurs="0"/>
+          <xs:element name="TotalDimWeight" type="ns:Weight" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Sum of dimensional weights for all packages.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="TotalBaseCharge" type="ns:Money" minOccurs="0"/>
+          <xs:element name="TotalFreightDiscounts" type="ns:Money" minOccurs="0"/>
+          <xs:element name="TotalNetFreight" type="ns:Money" minOccurs="0"/>
+          <xs:element name="TotalSurcharges" type="ns:Money" minOccurs="0"/>
+          <xs:element name="TotalNetFedExCharge" type="ns:Money" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>This shipment's totalNetFreight + totalSurcharges (not including totalTaxes).</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="TotalTaxes" type="ns:Money" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Total of the transportation-based taxes.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="TotalNetCharge" type="ns:Money" minOccurs="0"/>
+          <xs:element name="TotalRebates" type="ns:Money" minOccurs="0"/>
+          <xs:element name="TotalDutiesAndTaxes" type="ns:Money" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Total of all values under this shipment's dutiesAndTaxes; only provided if estimated duties and taxes were calculated for this shipment.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="TotalNetChargeWithDutiesAndTaxes" type="ns:Money" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>This shipment's totalNetCharge + totalDutiesAndTaxes; only provided if estimated duties and taxes were calculated for this shipment AND duties, taxes and transportation charges are all paid by the same sender's account.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="FreightRateDetail" type="ns:FreightRateDetail" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Rate data specific to FedEx Freight and FedEx National Freight services.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="FreightDiscounts" type="ns:RateDiscount" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>All rate discounts that apply to this shipment.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Rebates" type="ns:Rebate" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>All rebates that apply to this shipment.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Surcharges" type="ns:Surcharge" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>All surcharges that apply to this shipment.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Taxes" type="ns:Tax" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>All transportation-based taxes applicable to this shipment.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="DutiesAndTaxes" type="ns:EdtCommodityTax" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>All commodity-based duties and taxes applicable to this shipment.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="VariableHandlingCharges" type="ns:VariableHandlingCharges" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>The "order level" variable handling charges.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="TotalVariableHandlingCharges" type="ns:VariableHandlingCharges" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>The total of all variable handling charges at both shipment (order) and package level.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:simpleType name="ShipmentOnlyFieldsType">
+        <xs:annotation>
+          <xs:documentation>These values identify which package-level data values will be provided at the shipment-level.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="DIMENSIONS"/>
+          <xs:enumeration value="INSURED_VALUE"/>
+          <xs:enumeration value="WEIGHT"/>
+        </xs:restriction>
+      </xs:simpleType>
+      <xs:complexType name="ShipmentRateDetail">
         <xs:annotation>
           <xs:documentation>Data for a shipment's total/summary rates, as calculated per a specific rate type. The "total..." fields may differ from the sum of corresponding package data for Multiweight or Express MPS.</xs:documentation>
         </xs:annotation>
@@ -3775,17 +3891,11 @@
           <xs:element name="RateScale" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Indicates the rate scale used.</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>5</xs:MaxLength>
-              </xs:appinfo>
             </xs:annotation>
           </xs:element>
           <xs:element name="RateZone" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Indicates the rate zone used (based on origin and destination).</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>1</xs:MaxLength>
-              </xs:appinfo>
             </xs:annotation>
           </xs:element>
           <xs:element name="PricingCode" type="ns:PricingCodeType" minOccurs="0">
@@ -3880,6 +3990,11 @@
               <xs:documentation>This shipment's totalNetCharge + totalDutiesAndTaxes; only provided if estimated duties and taxes were calculated for this shipment AND duties, taxes and transportation charges are all paid by the same sender's account.</xs:documentation>
             </xs:annotation>
           </xs:element>
+          <xs:element name="ShipmentLegRateDetails" type="ns:ShipmentLegRateDetail" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>Identifies the Rate Details per each leg in a Freight Shipment</xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element name="FreightRateDetail" type="ns:FreightRateDetail" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Rate data specific to FedEx Freight and FedEx National Freight services.</xs:documentation>
@@ -3892,7 +4007,7 @@
           </xs:element>
           <xs:element name="Rebates" type="ns:Rebate" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
-               <xs:documentation>All rebates that apply to this shipment.</xs:documentation>
+              <xs:documentation>All rebates that apply to this shipment.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="Surcharges" type="ns:Surcharge" minOccurs="0" maxOccurs="unbounded">
@@ -3922,24 +4037,24 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="ShipmentSpecialServiceType">
+      <xs:simpleType name="ShipmentSpecialServiceType">
         <xs:annotation>
           <xs:documentation>Identifies the collection of special service offered by FedEx.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="BROKER_SELECT_OPTION"/>
-		  <xs:enumeration value="CALL_BEFORE_DELIVERY"/>
+          <xs:enumeration value="CALL_BEFORE_DELIVERY"/>
           <xs:enumeration value="COD"/>
-		  <xs:enumeration value="CUSTOM_DELIVERY_WINDOW"/>
-		  <xs:enumeration value="DANGEROUS_GOODS"/>
-		  <xs:enumeration value="DO_NOT_BREAK_DOWN_PALLETS"/>
-		  <xs:enumeration value="DO_NOT_STACK_PALLETS"/>
+          <xs:enumeration value="CUSTOM_DELIVERY_WINDOW"/>
+          <xs:enumeration value="DANGEROUS_GOODS"/>
+          <xs:enumeration value="DO_NOT_BREAK_DOWN_PALLETS"/>
+          <xs:enumeration value="DO_NOT_STACK_PALLETS"/>
           <xs:enumeration value="DRY_ICE"/>
           <xs:enumeration value="EAST_COAST_SPECIAL"/>
           <xs:enumeration value="ELECTRONIC_TRADE_DOCUMENTS"/>
           <xs:enumeration value="EMAIL_NOTIFICATION"/>
-		  <xs:enumeration value="EXTREME_LENGTH"/>
-		  <xs:enumeration value="FOOD"/>
+          <xs:enumeration value="EXTREME_LENGTH"/>
+          <xs:enumeration value="FOOD"/>
           <xs:enumeration value="FREIGHT_GUARANTEE"/>
           <xs:enumeration value="FUTURE_DAY_SHIPMENT"/>
           <xs:enumeration value="HOLD_AT_LOCATION"/>
@@ -3950,16 +4065,16 @@
           <xs:enumeration value="LIFTGATE_PICKUP"/>
           <xs:enumeration value="LIMITED_ACCESS_DELIVERY"/>
           <xs:enumeration value="LIMITED_ACCESS_PICKUP"/>
-		  <xs:enumeration value="PENDING_SHIPMENT"/>
-		  <xs:enumeration value="POISON"/>
-          <xs:enumeration value="PROTECTION_FROM_FREEZING"/>		  
+          <xs:enumeration value="PENDING_SHIPMENT"/>
+          <xs:enumeration value="POISON"/>
+          <xs:enumeration value="PROTECTION_FROM_FREEZING"/>
           <xs:enumeration value="RETURN_SHIPMENT"/>
           <xs:enumeration value="SATURDAY_DELIVERY"/>
           <xs:enumeration value="SATURDAY_PICKUP"/>
-		  <xs:enumeration value="TOP_LOAD"/>
+          <xs:enumeration value="TOP_LOAD"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="ShipmentSpecialServicesRequested">
+      <xs:complexType name="ShipmentSpecialServicesRequested">
         <xs:annotation>
           <xs:documentation>These special services are available at the shipment level for some or all service types. If the shipper is requesting a special service which requires additional data (such as the COD amount), the shipment special service type must be present in the specialServiceTypes collection, and the supporting detail must be provided in the appropriate sub-object below.</xs:documentation>
         </xs:annotation>
@@ -4011,14 +4126,14 @@
               <xs:documentation>Electronic Trade document references.</xs:documentation>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="CustomDeliveryWindowDetail" type="ns:CustomDeliveryWindowDetail" minOccurs="0">
+          <xs:element name="CustomDeliveryWindowDetail" type="ns:CustomDeliveryWindowDetail" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Specification for date or range of dates on which delivery is to be attempted.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="ShippingDocumentDispositionDetail">
+      <xs:complexType name="ShippingDocumentDispositionDetail">
         <xs:annotation>
           <xs:documentation>Each occurrence of this class specifies a particular way in which a kind of shipping document is to be produced and provided.</xs:documentation>
         </xs:annotation>
@@ -4051,7 +4166,7 @@
         </xs:annotation>
         <xs:restriction base="xs:string">
           <xs:enumeration value="CONFIRMED"/>
-		  <xs:enumeration value="DEFERRED_RETURNED"/>
+          <xs:enumeration value="DEFERRED_RETURNED"/>
           <xs:enumeration value="DEFERRED_STORED"/>
           <xs:enumeration value="EMAILED"/>
           <xs:enumeration value="QUEUED"/>
@@ -4059,7 +4174,7 @@
           <xs:enumeration value="STORED"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="ShippingDocumentEMailDetail">
+      <xs:complexType name="ShippingDocumentEMailDetail">
         <xs:annotation>
           <xs:documentation>Specifies how to e-mail shipping documents.</xs:documentation>
         </xs:annotation>
@@ -4099,7 +4214,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="ShippingDocumentFormat">
+      <xs:complexType name="ShippingDocumentFormat">
         <xs:annotation>
           <xs:documentation>Specifies characteristics of a shipping document to be produced.</xs:documentation>
         </xs:annotation>
@@ -4137,7 +4252,7 @@
           <xs:enumeration value="INDIVIDUAL"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="ShippingDocumentImageType">
+      <xs:simpleType name="ShippingDocumentImageType">
         <xs:annotation>
           <xs:documentation>Specifies the image format used for a shipping document.</xs:documentation>
         </xs:annotation>
@@ -4161,7 +4276,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="ShippingDocumentSpecification">
+      <xs:complexType name="ShippingDocumentSpecification">
         <xs:annotation>
           <xs:documentation>Contains all data required for additional (non-label) shipping documents to be produced in conjunction with a specific shipment.</xs:documentation>
         </xs:annotation>
@@ -4173,12 +4288,12 @@
           </xs:element>
           <xs:element name="CertificateOfOrigin" type="ns:CertificateOfOriginDetail" minOccurs="0"/>
           <xs:element name="CommercialInvoiceDetail" type="ns:CommercialInvoiceDetail" minOccurs="0"/>
-          <xs:element name="CustomPackageDocumentDetail" type="ns:CustomDocumentDetail" minOccurs="0">
+          <xs:element name="CustomPackageDocumentDetail" type="ns:CustomDocumentDetail" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
               <xs:documentation>Specifies the production of each package-level custom document (the same specification is used for all packages).</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="CustomShipmentDocumentDetail" type="ns:CustomDocumentDetail" minOccurs="0">
+          <xs:element name="CustomShipmentDocumentDetail" type="ns:CustomDocumentDetail" minOccurs="0" maxOccurs="unbounded">
             <xs:annotation>
               <xs:documentation>Specifies the production of a shipment-level custom document.</xs:documentation>
             </xs:annotation>
@@ -4200,13 +4315,13 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="ShippingDocumentStockType">
+      <xs:simpleType name="ShippingDocumentStockType">
         <xs:annotation>
           <xs:documentation>Specifies the type of paper (stock) on which a document will be printed.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-		  <xs:enumeration value="OP_900_LG_B"/>
-		  <xs:enumeration value="OP_900_LL_B"/>
+          <xs:enumeration value="OP_900_LG_B"/>
+          <xs:enumeration value="OP_900_LL_B"/>
           <xs:enumeration value="PAPER_4X6"/>
           <xs:enumeration value="PAPER_LETTER"/>
           <xs:enumeration value="STOCK_4X6"/>
@@ -4217,12 +4332,12 @@
           <xs:enumeration value="STOCK_4X9_TRAILING_DOC_TAB"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="SignatureOptionDetail">
+      <xs:complexType name="SignatureOptionDetail">
         <xs:annotation>
           <xs:documentation>The descriptive data required for FedEx delivery signature services.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="OptionType" type="ns:SignatureOptionType">
+          <xs:element name="OptionType" type="ns:SignatureOptionType" minOccurs="1">
             <xs:annotation>
               <xs:documentation>Identifies the delivery signature services option selected by the customer for this shipment. See OptionType for the list of valid values.</xs:documentation>
             </xs:annotation>
@@ -4249,7 +4364,7 @@
           <xs:enumeration value="SERVICE_DEFAULT"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="SmartPostAncillaryEndorsementType">
+      <xs:simpleType name="SmartPostAncillaryEndorsementType">
         <xs:annotation>
           <xs:documentation>These values are mutually exclusive; at most one of them can be attached to a SmartPost shipment.</xs:documentation>
         </xs:annotation>
@@ -4261,10 +4376,10 @@
           <xs:enumeration value="RETURN_SERVICE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:simpleType name="SmartPostIndiciaType">
+      <xs:simpleType name="SmartPostIndiciaType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="MEDIA_MAIL"/>
-		  <xs:enumeration value="PARCEL_RETURN"/>
+          <xs:enumeration value="PARCEL_RETURN"/>
           <xs:enumeration value="PARCEL_SELECT"/>
           <xs:enumeration value="PRESORTED_BOUND_PRINTED_MATTER"/>
           <xs:enumeration value="PRESORTED_STANDARD"/>
@@ -4281,7 +4396,7 @@
           <xs:element name="CustomerManifestId" type="xs:string" minOccurs="0"/>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="SpecialRatingAppliedType">
+      <xs:simpleType name="SpecialRatingAppliedType">
         <xs:annotation>
           <xs:documentation>Indicates which special rating cases applied to this shipment.</xs:documentation>
         </xs:annotation>
@@ -4309,7 +4424,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="SurchargeLevelType">
+      <xs:simpleType name="SurchargeLevelType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="PACKAGE"/>
           <xs:enumeration value="SHIPMENT"/>
@@ -4318,7 +4433,7 @@
       <xs:simpleType name="SurchargeType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="ADDITIONAL_HANDLING"/>
-		  <xs:enumeration value="ANCILLARY_FEE"/>
+          <xs:enumeration value="ANCILLARY_FEE"/>
           <xs:enumeration value="APPOINTMENT_DELIVERY"/>
           <xs:enumeration value="BROKER_SELECT_OPTION"/>
           <xs:enumeration value="CANADIAN_DESTINATION"/>
@@ -4328,11 +4443,11 @@
           <xs:enumeration value="DANGEROUS_GOODS"/>
           <xs:enumeration value="DELIVERY_AREA"/>
           <xs:enumeration value="DELIVERY_CONFIRMATION"/>
-		  <xs:enumeration value="DOCUMENTATION_FEE"/>
+          <xs:enumeration value="DOCUMENTATION_FEE"/>
           <xs:enumeration value="DRY_ICE"/>
           <xs:enumeration value="EMAIL_LABEL"/>
           <xs:enumeration value="EUROPE_FIRST"/>
-		  <xs:enumeration value="EXCESS_VALUE"/>
+          <xs:enumeration value="EXCESS_VALUE"/>
           <xs:enumeration value="EXHIBITION"/>
           <xs:enumeration value="EXPORT"/>
           <xs:enumeration value="EXTREME_LENGTH"/>
@@ -4340,9 +4455,9 @@
           <xs:enumeration value="FICE"/>
           <xs:enumeration value="FLATBED"/>
           <xs:enumeration value="FREIGHT_GUARANTEE"/>
-		  <xs:enumeration value="FREIGHT_ON_VALUE"/>
+          <xs:enumeration value="FREIGHT_ON_VALUE"/>
           <xs:enumeration value="FUEL"/>
-		  <xs:enumeration value="HOLD_AT_LOCATION"/>
+          <xs:enumeration value="HOLD_AT_LOCATION"/>
           <xs:enumeration value="HOME_DELIVERY_APPOINTMENT"/>
           <xs:enumeration value="HOME_DELIVERY_DATE_CERTAIN"/>
           <xs:enumeration value="HOME_DELIVERY_EVENING"/>
@@ -4377,11 +4492,11 @@
           <xs:enumeration value="SATURDAY_PICKUP"/>
           <xs:enumeration value="SIGNATURE_OPTION"/>
           <xs:enumeration value="TARP"/>
-		  <xs:enumeration value="THIRD_PARTY_CONSIGNEE"/>
+          <xs:enumeration value="THIRD_PARTY_CONSIGNEE"/>
           <xs:enumeration value="TRANSMART_SERVICE_FEE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="Tax">
+      <xs:complexType name="Tax">
         <xs:annotation>
           <xs:documentation>Identifies each tax applied to the shipment.</xs:documentation>
         </xs:annotation>
@@ -4396,13 +4511,26 @@
           <xs:enumeration value="EXPORT"/>
           <xs:enumeration value="GST"/>
           <xs:enumeration value="HST"/>
-		  <xs:enumeration value="INTRACOUNTRY"/>
+          <xs:enumeration value="INTRACOUNTRY"/>
           <xs:enumeration value="OTHER"/>
           <xs:enumeration value="PST"/>
           <xs:enumeration value="VAT"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="TaxpayerIdentification">
+      <xs:simpleType name="TaxesOrMiscellaneousChargeType">
+        <xs:annotation>
+          <xs:documentation>Specifice the kind of tax or miscellaneous charge being reported on a Commercial Invoice.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="COMMISSIONS"/>
+          <xs:enumeration value="DISCOUNTS"/>
+          <xs:enumeration value="HANDLING_FEES"/>
+          <xs:enumeration value="OTHER"/>
+          <xs:enumeration value="ROYALTIES_AND_LICENSE_FEES"/>
+          <xs:enumeration value="TAXES"/>
+        </xs:restriction>
+      </xs:simpleType>
+      <xs:complexType name="TaxpayerIdentification">
         <xs:annotation>
           <xs:documentation>The descriptive data for taxpayer identification information.</xs:documentation>
         </xs:annotation>
@@ -4420,7 +4548,7 @@
               </xs:appinfo>
             </xs:annotation>
           </xs:element>
-		  <xs:element name="Usage" type="xs:string" minOccurs="0">
+          <xs:element name="Usage" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Identifies the usage of Tax Identification Number in Shipment processing</xs:documentation>
             </xs:annotation>
@@ -4453,27 +4581,28 @@
           <xs:documentation>Identifies the category of the taxpayer identification number.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-		  <xs:enumeration value="BUSINESS_NATIONAL"/>
+          <xs:enumeration value="BUSINESS_NATIONAL"/>
           <xs:enumeration value="BUSINESS_STATE"/>
           <xs:enumeration value="PERSONAL_NATIONAL"/>
           <xs:enumeration value="PERSONAL_STATE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="TrackingId">
+      <xs:complexType name="TrackingId">
         <xs:sequence>
           <xs:element name="TrackingIdType" type="ns:TrackingIdType" minOccurs="0"/>
           <xs:element name="FormId" type="xs:string" minOccurs="0"/>
-          <xs:element name="TrackingNumber" type="xs:string"/>
+          <xs:element name="TrackingNumber" type="xs:string" minOccurs="1"/>
         </xs:sequence>
       </xs:complexType>
       <xs:simpleType name="TrackingIdType">
         <xs:restriction base="xs:string">
           <xs:enumeration value="EXPRESS"/>
+          <xs:enumeration value="FEDEX"/>
           <xs:enumeration value="GROUND"/>
           <xs:enumeration value="USPS"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="TransactionDetail">
+      <xs:complexType name="TransactionDetail">
         <xs:annotation>
           <xs:documentation>Descriptive data for this customer transaction. The TransactionDetail from the request is echoed back to the caller in the corresponding reply.</xs:documentation>
         </xs:annotation>
@@ -4481,9 +4610,6 @@
           <xs:element name="CustomerTransactionId" type="xs:string" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Free form text to be echoed back in the reply. Used to match requests and replies.</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>40</xs:MaxLength>
-              </xs:appinfo>
             </xs:annotation>
           </xs:element>
           <xs:element name="Localization" type="ns:Localization" minOccurs="0">
@@ -4493,35 +4619,35 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:simpleType name="TransitTimeType">
+      <xs:simpleType name="TransitTimeType">
         <xs:annotation>
           <xs:documentation>Time in transit from pickup to delivery.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-          <xs:enumeration value="ONE_DAY"/>
-          <xs:enumeration value="TWO_DAYS"/>
-          <xs:enumeration value="THREE_DAYS"/>
-          <xs:enumeration value="FOUR_DAYS"/>
-          <xs:enumeration value="FIVE_DAYS"/>
-          <xs:enumeration value="SIX_DAYS"/>
-          <xs:enumeration value="SEVEN_DAYS"/>
-          <xs:enumeration value="EIGHT_DAYS"/>
-          <xs:enumeration value="NINE_DAYS"/>
-          <xs:enumeration value="TEN_DAYS"/>
-          <xs:enumeration value="ELEVEN_DAYS"/>
-          <xs:enumeration value="TWELVE_DAYS"/>
-          <xs:enumeration value="THIRTEEN_DAYS"/>
-          <xs:enumeration value="FOURTEEN_DAYS"/>
-          <xs:enumeration value="FIFTEEN_DAYS"/>
-          <xs:enumeration value="SIXTEEN_DAYS"/>
-          <xs:enumeration value="SEVENTEEN_DAYS"/>
           <xs:enumeration value="EIGHTEEN_DAYS"/>
+          <xs:enumeration value="EIGHT_DAYS"/>
+          <xs:enumeration value="ELEVEN_DAYS"/>
+          <xs:enumeration value="FIFTEEN_DAYS"/>
+          <xs:enumeration value="FIVE_DAYS"/>
+          <xs:enumeration value="FOURTEEN_DAYS"/>
+          <xs:enumeration value="FOUR_DAYS"/>
           <xs:enumeration value="NINETEEN_DAYS"/>
+          <xs:enumeration value="NINE_DAYS"/>
+          <xs:enumeration value="ONE_DAY"/>
+          <xs:enumeration value="SEVENTEEN_DAYS"/>
+          <xs:enumeration value="SEVEN_DAYS"/>
+          <xs:enumeration value="SIXTEEN_DAYS"/>
+          <xs:enumeration value="SIX_DAYS"/>
+          <xs:enumeration value="TEN_DAYS"/>
+          <xs:enumeration value="THIRTEEN_DAYS"/>
+          <xs:enumeration value="THREE_DAYS"/>
+          <xs:enumeration value="TWELVE_DAYS"/>
           <xs:enumeration value="TWENTY_DAYS"/>
+          <xs:enumeration value="TWO_DAYS"/>
           <xs:enumeration value="UNKNOWN"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="UploadDocumentDetail">
+      <xs:complexType name="UploadDocumentDetail">
         <xs:sequence>
           <xs:element name="LineNumber" type="xs:nonNegativeInteger" minOccurs="0"/>
           <xs:element name="CustomerReference" type="xs:string" minOccurs="0"/>
@@ -4546,7 +4672,7 @@
           <xs:enumeration value="OTHER"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="UploadDocumentReferenceDetail">
+      <xs:complexType name="UploadDocumentReferenceDetail">
         <xs:sequence>
           <xs:element name="LineNumber" type="xs:nonNegativeInteger" minOccurs="0"/>
           <xs:element name="CustomerReference" type="xs:string" minOccurs="0"/>
@@ -4566,16 +4692,11 @@
           <xs:enumeration value="PRO_FORMA_INVOICE"/>
         </xs:restriction>
       </xs:simpleType>
-	  <xs:complexType name="VariableHandlingChargeDetail">
+      <xs:complexType name="VariableHandlingChargeDetail">
         <xs:annotation>
-          <xs:documentation>Details about how to calculate variable handling charges at the shipment level.</xs:documentation>
+          <xs:documentation>This definition of variable handling charge detail is intended for use in Jan 2011 corp load.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="VariableHandlingChargeType" type="ns:VariableHandlingChargeType" minOccurs="1">
-            <xs:annotation>
-              <xs:documentation>The type of handling charge to be calculated and returned in the reply.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
           <xs:element name="FixedValue" type="ns:Money" minOccurs="0">
             <xs:annotation>
               <xs:documentation>Used with Variable handling charge type of FIXED_VALUE. Contains the amount to be added to the freight charge. Contains 2 explicit decimal positions with a total max length of 10 including the decimal.</xs:documentation>
@@ -4583,22 +4704,21 @@
           </xs:element>
           <xs:element name="PercentValue" type="xs:decimal" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>Used with Variable handling charge types PERCENTAGE_OF_BASE, PERCENTAGE_OF_NET or PERCETAGE_OF_NET_EXCL_TAXES. Used to calculate the amount to be added to the freight charge. Contains 2 explicit decimal positions.</xs:documentation>
+              <xs:documentation>Actual percentage (10 means 10%, which is a mutiplier of 0.1)</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="RateElementBasis" type="ns:RateElementBasisType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Select the value from a set of rate data to which the percentage is applied.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="RateTypeBasis" type="ns:RateTypeBasisType" minOccurs="0">
+            <xs:annotation>
+              <xs:documentation>Select the type of rate from which the element is to be selected.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-      <xs:simpleType name="VariableHandlingChargeType">
-        <xs:annotation>
-          <xs:documentation>The type of handling charge to be calculated and returned in the reply.</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="FIXED_AMOUNT"/>
-          <xs:enumeration value="PERCENTAGE_OF_NET_CHARGE"/>
-          <xs:enumeration value="PERCENTAGE_OF_NET_CHARGE_EXCLUDING_TAXES"/>
-          <xs:enumeration value="PERCENTAGE_OF_NET_FREIGHT"/>
-        </xs:restriction>
-      </xs:simpleType>
       <xs:complexType name="VariableHandlingCharges">
         <xs:annotation>
           <xs:documentation>The variable handling charges calculated based on the type variable handling charges requested.</xs:documentation>
@@ -4616,34 +4736,7 @@
           </xs:element>
         </xs:sequence>
       </xs:complexType>
-	  <xs:complexType name="VersionId">
-        <xs:annotation>
-          <xs:documentation>Identifies the version/level of a service operation expected by a caller (in each request) and performed by the callee (in each reply).</xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:element name="ServiceId" type="xs:string" minOccurs="1" fixed="crs">
-            <xs:annotation>
-              <xs:documentation>Identifies a system or sub-system which performs an operation.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Major" type="xs:int" fixed="9" minOccurs="1">
-            <xs:annotation>
-              <xs:documentation>Identifies the service business level.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Intermediate" type="xs:int" fixed="0" minOccurs="1">
-            <xs:annotation>
-              <xs:documentation>Identifies the service interface level.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Minor" type="xs:int" fixed="0" minOccurs="1">
-            <xs:annotation>
-              <xs:documentation>Identifies the service code level.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-        </xs:sequence>
-      </xs:complexType>
-	  <xs:complexType name="Volume">
+      <xs:complexType name="Volume">
         <xs:annotation>
           <xs:documentation>Three-dimensional volume/cubic measurement.</xs:documentation>
         </xs:annotation>
@@ -4661,54 +4754,19 @@
           <xs:enumeration value="CUBIC_M"/>
         </xs:restriction>
       </xs:simpleType>
-      <xs:complexType name="WebAuthenticationCredential">
-        <xs:annotation>
-          <xs:documentation>Two part authentication string used for the sender's identity</xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:element name="Key" type="xs:string" minOccurs="1">
-            <xs:annotation>
-              <xs:documentation>Identifying part of authentication credential. This value is provided by FedEx after registration</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>16</xs:MaxLength>
-              </xs:appinfo>
-            </xs:annotation>
-          </xs:element>
-          <xs:element name="Password" type="xs:string" minOccurs="1">
-            <xs:annotation>
-              <xs:documentation>Secret part of authentication key. This value is provided by FedEx after registration.</xs:documentation>
-              <xs:appinfo>
-                <xs:MaxLength>25</xs:MaxLength>
-              </xs:appinfo>
-            </xs:annotation>
-          </xs:element>
-        </xs:sequence>
-      </xs:complexType>
-	  <xs:complexType name="WebAuthenticationDetail">
-        <xs:annotation>
-          <xs:documentation>Used in authentication of the sender's identity.</xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:element name="UserCredential" type="ns:WebAuthenticationCredential" minOccurs="1">
-            <xs:annotation>
-              <xs:documentation>Credential used to authenticate a specific software application. This value is provided by FedEx after registration.</xs:documentation>
-            </xs:annotation>
-          </xs:element>
-        </xs:sequence>
-      </xs:complexType>
       <xs:complexType name="Weight">
         <xs:annotation>
           <xs:documentation>The descriptive data for the heaviness of an object.</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-          <xs:element name="Units" type="ns:WeightUnits">
+          <xs:element name="Units" type="ns:WeightUnits" minOccurs="1">
             <xs:annotation>
-              <xs:documentation>Identifies the unit of measure associated with a weight value. See WeightUnits for the list of valid enumerated values.</xs:documentation>
+              <xs:documentation>Identifies the unit of measure associated with a weight value.</xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="Value" type="xs:decimal">
+          <xs:element name="Value" type="xs:decimal" minOccurs="1">
             <xs:annotation>
-              <xs:documentation>Identifies the weight value of the package/shipment. Contains 1 explicit decimal position</xs:documentation>
+              <xs:documentation>Identifies the weight value of a package/shipment.</xs:documentation>
             </xs:annotation>
           </xs:element>
         </xs:sequence>
@@ -4722,6 +4780,62 @@
           <xs:enumeration value="LB"/>
         </xs:restriction>
       </xs:simpleType>
+      <xs:complexType name="WebAuthenticationDetail">
+        <xs:annotation>
+          <xs:documentation>Used in authentication of the sender's identity.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+          <xs:element name="UserCredential" type="ns:WebAuthenticationCredential" minOccurs="1">
+            <xs:annotation>
+              <xs:documentation>Credential used to authenticate a specific software application. This value is provided by FedEx after registration.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="WebAuthenticationCredential">
+        <xs:annotation>
+          <xs:documentation>Two part authentication string used for the sender's identity</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+          <xs:element name="Key" type="xs:string" minOccurs="1">
+            <xs:annotation>
+              <xs:documentation>Identifying part of authentication credential. This value is provided by FedEx after registration</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Password" type="xs:string" minOccurs="1">
+            <xs:annotation>
+              <xs:documentation>Secret part of authentication key. This value is provided by FedEx after registration.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="VersionId">
+        <xs:annotation>
+          <xs:documentation>Identifies the version/level of a service operation expected by a caller (in each request) and performed by the callee (in each reply).</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+          <xs:element name="ServiceId" type="xs:string" fixed="crs" minOccurs="1">
+            <xs:annotation>
+              <xs:documentation>Identifies a system or sub-system which performs an operation.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Major" type="xs:int" fixed="10" minOccurs="1">
+            <xs:annotation>
+              <xs:documentation>Identifies the service business level.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Intermediate" type="xs:int" fixed="0" minOccurs="1">
+            <xs:annotation>
+              <xs:documentation>Identifies the service interface level.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element name="Minor" type="xs:int" fixed="0" minOccurs="1">
+            <xs:annotation>
+              <xs:documentation>Identifies the service code level.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
     </xs:schema>
   </types>
   <message name="RateRequest">
@@ -4750,7 +4864,7 @@
   </binding>
   <service name="RateService">
     <port name="RateServicePort" binding="ns:RateServiceSoapBinding">
-      <s1:address location="https://gateway.fedex.com:443/web-services/rate"/>
+      <s1:address location="https://wsbeta.fedex.com:443/web-services/rate"/>
     </port>
   </service>
-</definitions>
+</definitions>
\ No newline at end of file
diff --git a/modules/fedexcarrier/config.xml b/modules/fedexcarrier/config.xml
index 6a4f6c2fe..3e2b10939 100755
--- a/modules/fedexcarrier/config.xml
+++ b/modules/fedexcarrier/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>fedexcarrier</name>
 	<displayName><![CDATA[Fedex Carrier]]></displayName>
-	<version><![CDATA[1.1]]></version>
+	<version><![CDATA[1.2]]></version>
 	<description><![CDATA[Offer your customers, different delivery methods with Fedex]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[shipping_logistics]]></tab>
diff --git a/modules/fedexcarrier/fedexcarrier.php b/modules/fedexcarrier/fedexcarrier.php
index 0967052f2..50980c9f7 100644
--- a/modules/fedexcarrier/fedexcarrier.php
+++ b/modules/fedexcarrier/fedexcarrier.php
@@ -56,7 +56,7 @@ class FedexCarrier extends CarrierModule
 	{
 		$this->name = 'fedexcarrier';
 		$this->tab = 'shipping_logistics';
-		$this->version = '1.1';
+		$this->version = '1.2';
 		$this->author = 'PrestaShop';
 		$this->limited_countries = array('us');
 
@@ -1636,7 +1636,7 @@ class FedexCarrier extends CarrierModule
 
 		// Enable Php Soap
 		ini_set("soap.wsdl_cache_enabled", "0");
-		$client = new SoapClient($dir.'/RateService_v9.wsdl', array('trace' => 1)); // Refer to http://us3.php.net/manual/en/ref.soap.php for more information
+		$client = new SoapClient($dir.'/RateService_v10.wsdl', array('trace' => 1)); // Refer to http://us3.php.net/manual/en/ref.soap.php for more information
 
 		// Country / State
 		$shipper_country = Db::getInstance()->getRow('SELECT `iso_code` FROM `'._DB_PREFIX_.'country` WHERE `id_country` = '.(int)(Configuration::get('FEDEX_CARRIER_COUNTRY')));
@@ -1645,8 +1645,8 @@ class FedexCarrier extends CarrierModule
 		// Generating soap request
 		$request['WebAuthenticationDetail']['UserCredential'] = array('Key' => Configuration::get('FEDEX_CARRIER_API_KEY'), 'Password' => Configuration::get('FEDEX_CARRIER_PASSWORD')); 
 		$request['ClientDetail'] = array('AccountNumber' => Configuration::get('FEDEX_CARRIER_ACCOUNT'), 'MeterNumber' => Configuration::get('FEDEX_CARRIER_METER'));
-		$request['TransactionDetail'] = array('CustomerTransactionId' => ' *** Rate Available Services Request v9 using PHP ***');
-		$request['Version'] = array('ServiceId' => 'crs', 'Major' => '9', 'Intermediate' => '0', 'Minor' => '0');
+		$request['TransactionDetail'] = array('CustomerTransactionId' => ' *** Rate Available Services Request v10 using PHP ***');
+		$request['Version'] = array('ServiceId' => 'crs', 'Major' => '10', 'Intermediate' => '0', 'Minor' => '0');
 		$request['ReturnTransitAndCommit'] = true;
 		$request['RequestedShipment']['DropoffType'] = Configuration::get('FEDEX_CARRIER_PICKUP_TYPE'); // valid values REGULAR_PICKUP, REQUEST_COURIER, ...
 		$request['RequestedShipment']['ShipTimestamp'] = date('c');
@@ -1659,9 +1659,8 @@ class FedexCarrier extends CarrierModule
 		$request['RequestedShipment']['ShippingChargesPayment'] = array('PaymentType' => 'SENDER', 'Payor' => array('AccountNumber' => Configuration::get('FEDEX_CARRIER_ACCOUNT'), 'CountryCode' => 'US'));
 		$request['RequestedShipment']['RateRequestTypes'] = 'ACCOUNT'; 
 		$request['RequestedShipment']['RateRequestTypes'] = 'LIST'; 
-		$request['RequestedShipment']['PackageCount'] = '2';
-		$request['RequestedShipment']['PackageDetail'] = 'INDIVIDUAL_PACKAGES';
-		$request['RequestedShipment']['RequestedPackageLineItems'] = array('0' => array('Weight' => array('Value' => 2.0, 'Units' => 'LB'), 'Dimensions' => array('Length' => 10, 'Width' => 10, 'Height' => 3, 'Units' => 'IN')));
+		$request['RequestedShipment']['PackageCount'] = '1';
+		$request['RequestedShipment']['RequestedPackageLineItems'] = array('0' => array('SequenceNumber' => 1, 'GroupPackageCount' => 1, 'Weight' => array('Value' => 2.0, 'Units' => 'LB'), 'Dimensions' => array('Length' => 10, 'Width' => 10, 'Height' => 3, 'Units' => 'IN')));
 
 
 		// Unit or Large Test
@@ -1683,7 +1682,10 @@ class FedexCarrier extends CarrierModule
 			if ($resultTabTmp)
 				$resultTab = unserialize($resultTabTmp);
 			else
-				$resultTab = $client->getRates($request);
+			{
+				try { $resultTab = $client->getRates($request); }
+				catch (Exception $e) { }				
+			}
 
 			// Cache test result
 			if (empty($resultTabTmp) && isset($resultTab->HighestSeverity) && ($resultTab->HighestSeverity == 'SUCCESS' OR $resultTab->HighestSeverity == 'ERROR'))
@@ -1722,7 +1724,7 @@ class FedexCarrier extends CarrierModule
 
 		// Enable Php Soap
 		ini_set("soap.wsdl_cache_enabled", "0");
-		$client = new SoapClient($dir.'/RateService_v9.wsdl', array('trace' => 1)); // Refer to http://us3.php.net/manual/en/ref.soap.php for more information
+		$client = new SoapClient($dir.'/RateService_v10.wsdl', array('trace' => 1)); // Refer to http://us3.php.net/manual/en/ref.soap.php for more information
 
 		// Country / State
 		$shipper_country = Db::getInstance()->getRow('SELECT `iso_code` FROM `'._DB_PREFIX_.'country` WHERE `id_country` = '.(int)(Configuration::get('FEDEX_CARRIER_COUNTRY')));
@@ -1731,8 +1733,8 @@ class FedexCarrier extends CarrierModule
 		// Generating soap request
 		$request['WebAuthenticationDetail']['UserCredential'] = array('Key' => Configuration::get('FEDEX_CARRIER_API_KEY'), 'Password' => Configuration::get('FEDEX_CARRIER_PASSWORD')); 
 		$request['ClientDetail'] = array('AccountNumber' => Configuration::get('FEDEX_CARRIER_ACCOUNT'), 'MeterNumber' => Configuration::get('FEDEX_CARRIER_METER'));
-		$request['TransactionDetail'] = array('CustomerTransactionId' => ' *** Rate Available Services Request v9 using PHP ***');
-		$request['Version'] = array('ServiceId' => 'crs', 'Major' => '9', 'Intermediate' => '0', 'Minor' => '0');
+		$request['TransactionDetail'] = array('CustomerTransactionId' => ' *** Rate Available Services Request v10 using PHP ***');
+		$request['Version'] = array('ServiceId' => 'crs', 'Major' => '10', 'Intermediate' => '0', 'Minor' => '0');
 		$request['ReturnTransitAndCommit'] = true;
 		$request['RequestedShipment']['DropoffType'] = Configuration::get('FEDEX_CARRIER_PICKUP_TYPE'); // valid values REGULAR_PICKUP, REQUEST_COURIER, ...
 		$request['RequestedShipment']['ShipTimestamp'] = date('c');
@@ -1746,14 +1748,22 @@ class FedexCarrier extends CarrierModule
 		$request['RequestedShipment']['RateRequestTypes'] = 'ACCOUNT'; 
 		$request['RequestedShipment']['RateRequestTypes'] = 'LIST'; 
 		$request['RequestedShipment']['PackageCount'] = '2';
-		$request['RequestedShipment']['PackageDetail'] = 'INDIVIDUAL_PACKAGES';
+		$count = 1;
 		foreach ($wsParams['package_list'] as $p)
-			$request['RequestedShipment']['RequestedPackageLineItems'][] = array('Weight' => array('Value' => $p['weight'], 'Units' => substr($this->_weightUnit, 0, 2)), 'Dimensions' => array('Length' => $p['depth'], 'Width' => $p['width'], 'Height' => $p['height'], 'Units' => $this->_dimensionUnit));
+		{
+			$request['RequestedShipment']['RequestedPackageLineItems'][] = array(
+				'SequenceNumber' => $count,
+				'GroupPackageCount' => $count,
+				'Weight' => array('Value' => $p['weight'], 'Units' => substr($this->_weightUnit, 0, 2)),
+				'Dimensions' => array('Length' => $p['depth'], 'Width' => $p['width'], 'Height' => $p['height'], 'Units' => $this->_dimensionUnit));
+			$count++;
+		}
 		$request['RequestedShipment']['PackageCount'] = count($request['RequestedShipment']['RequestedPackageLineItems']);
 
 
 		// Get Rates
-		$resultTab = $client->getRates($request);
+		try { $resultTab = $client->getRates($request); }
+		catch (Exception $e) { return array('connect' => false, 'cost' => 0); }
 
 
 		// Check currency
diff --git a/modules/ganalytics/ganalytics.php b/modules/ganalytics/ganalytics.php
index 493d7e970..9ca8209b9 100644
--- a/modules/ganalytics/ganalytics.php
+++ b/modules/ganalytics/ganalytics.php
@@ -152,7 +152,8 @@ class GAnalytics extends Module
 	function hookHeader($params)
 	{
 		// hookOrderConfirmation() already send the sats bypass this step
-		if (strpos($_SERVER['REQUEST_URI'], __PS_BASE_URI__.'order-confirmation.php') === 0) return '';
+		if (strpos($_SERVER['REQUEST_URI'], __PS_BASE_URI__.'order-confirmation.php') === 0)
+			return '';
 	
 		// Otherwise, create Google Analytics stats
 		$ganalytics_id = Configuration::get('GANALYTICS_ID');
@@ -169,7 +170,8 @@ class GAnalytics extends Module
 	function hookFooter($params)
 	{
 		// for retrocompatibility
-		if (!$this->isRegisteredInHook('header')) $this->registerHook('header');
+		if (!$this->isRegisteredInHook('header'))
+			$this->registerHook('header');
 		return ;
 	}
 
@@ -191,7 +193,8 @@ class GAnalytics extends Module
 			}
 
 			// Order general information
-		$trans = array('id' => intval($order->id),				// order ID - required
+			$trans = array(
+				'id' => intval($order->id),				// order ID - required
 						'store' => htmlentities(Configuration::get('PS_SHOP_NAME')), // affiliation or store name
 						'total' => Tools::ps_round(floatval($order->total_paid) / floatval($conversion_rate), 2),		// total - required
 						'tax' => '0', // tax
@@ -210,7 +213,8 @@ class GAnalytics extends Module
 								WHERE `id_product` = '.intval($product['product_id']).' AND `id_category_default` = `id_category` 
 								AND `id_lang` = '.intval($parameters['PS_LANG_DEFAULT']));
 				
-				$items[] = array('OrderId' => intval($order->id),				// order ID - required
+				$items[] = array(
+					'OrderId' => intval($order->id),								// order ID - required
 								'SKU' => addslashes($product['product_id']),		// SKU/code - required
 								'Product' => addslashes($product['product_name']),		// product name
 								'Category' => addslashes($category['name']),			// category or variation
@@ -219,11 +223,10 @@ class GAnalytics extends Module
 								);
 			}
 			$ganalytics_id = Configuration::get('GANALYTICS_ID');
-			$pageTrack = (strpos($_SERVER['REQUEST_URI'], __PS_BASE_URI__.'order.php') === 0 ? '/order/step'.intval($step).'.html' : '');
+
 			$this->context->smarty->assign('items', $items);
 			$this->context->smarty->assign('trans', $trans);
 			$this->context->smarty->assign('ganalytics_id', $ganalytics_id);
-			$this->context->smarty->assign('pageTrack', $pageTrack);
 			$this->context->smarty->assign('isOrder', true);
 			return $this->display(__FILE__, 'header.tpl');
 		}
diff --git a/modules/ganalytics/header.tpl b/modules/ganalytics/header.tpl
index bfa718ae6..5c5769b4e 100644
--- a/modules/ganalytics/header.tpl
+++ b/modules/ganalytics/header.tpl
@@ -1,7 +1,7 @@
 <script type="text/javascript">
 var _gaq = _gaq || [];
 _gaq.push(['_setAccount', '{$ganalytics_id}']);
-_gaq.push(['_trackPageview', '{$pageTrack}']);
+{if isset($pageTrack)}_gaq.push(['_trackPageview', '{$pageTrack}']);{/if}
 _gaq.push(['_trackPageLoadTime']);
 {if $isOrder eq true}		{* If it's an order we need more data for stats *}
   _gaq.push(['_addTrans',
diff --git a/modules/loyalty/de.php b/modules/loyalty/de.php
index 4abe42e6f..efd78a665 100644
--- a/modules/loyalty/de.php
+++ b/modules/loyalty/de.php
@@ -24,8 +24,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Nei
 $_MODULE['<{loyalty}prestashop>loyalty_ade45d72ab6ba1ab576d8b9deb0c2438'] = 'Punkte werden vergeben, wenn die Bestellung';
 $_MODULE['<{loyalty}prestashop>loyalty_9611a682e61c503c32e2dc58fdbc8ddf'] = 'Punkte werden gelöscht, wenn die Bestellung';
 $_MODULE['<{loyalty}prestashop>loyalty_2a46cccdea2f18fdfdfacf99a98b758d'] = 'Gutscheine, die vom Treue-System erstellt wurden, können in den folgenden Kategorien verwendet werden:';
-$_MODULE['<{loyalty}prestashop>loyalty_b718adec73e04ce3ec720dd11a06a308'] = 'ID';
-$_MODULE['<{loyalty}prestashop>loyalty_49ee3087348e8d44e1feda1917443987'] = 'Name';
+$_MODULE['<{loyalty}prestashop>loyalty_8cf04a9734132302f96da8e113e80ce5'] = 'Start';
 $_MODULE['<{loyalty}prestashop>loyalty_c2a7db7dec4de1bdb143ccd790f5a62c'] = 'Markieren Sie alle Kontrollkästchen der Kategorien, in denen Treue-Gutscheine nutzbar sind';
 $_MODULE['<{loyalty}prestashop>loyalty_30e793698766edbaaf84a74d4c377f72'] = 'Treuepunkte-Fortschritt';
 $_MODULE['<{loyalty}prestashop>loyalty_4f2a91e15af2631ff9424564b8a45fb2'] = 'Ursprünglich';
@@ -80,7 +79,6 @@ $_MODULE['<{loyalty}prestashop>loyalty_a16cf3ec5200cc519f4fe48e34b1df83'] = 'Die
 $_MODULE['<{loyalty}prestashop>loyalty_8e69341aca5dbf9f55c2e75a2ed5df3c'] = 'Noch keine Gutscheine.';
 $_MODULE['<{loyalty}prestashop>loyalty_00d56a5e37c19c59d521530fc8e7f337'] = 'Noch keine Bonuspunkte.';
 $_MODULE['<{loyalty}prestashop>loyalty_0b3db27bc15f682e92ff250ebb167d4b'] = 'Zurück zu Ihrem Konto';
-$_MODULE['<{loyalty}prestashop>loyalty_8cf04a9734132302f96da8e113e80ce5'] = 'Start';
 $_MODULE['<{loyalty}prestashop>my-account_c540093e64d84440025b2d8201f04336'] = 'Meine Treuepunkte';
 $_MODULE['<{loyalty}prestashop>product_ded9088edfbcc1041c3a642b031c8f72'] = 'Treueprogramm';
 $_MODULE['<{loyalty}prestashop>product_08ef6b34ab8e7039ef0ee69378f0ac0b'] = 'Sammeln Sie mit dem Kauf dieses Produktes Sie bis zu';
diff --git a/modules/mondialrelay/de.php b/modules/mondialrelay/de.php
index 7ec838716..d39b09380 100644
--- a/modules/mondialrelay/de.php
+++ b/modules/mondialrelay/de.php
@@ -33,12 +33,10 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_cb5e100e5a9a3e7f6d1fd9751221528
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_350c1cc4343826a89f08a33bb49c6d98'] = 'Mondial Relay Bewertungsmodul konfigurieren';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_d21a9f93917604d5490ad529a7cf1ff9'] = 'So erstellen Sie eine Mondial Relay Lieferanten';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_c6a2e6af5fff47adb3afd780b97d9b4b'] = 'Geben Sie Ihre Mondial Relay-Konto-Einstellungen ein und speichern Sie sie';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_abfc836cd1df9d6d2bdfd2fc98e6fa93'] = 'Erstellen Sie einen Lieferanten';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_b962d8fb95f5a439f50502152f3bad71'] = 'Definieren Sie einen Preis für Ihren Lieferanten auf';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_faf1247ae6846a9955a466d4f301bbe4'] = 'Der Lieferanten-Seite';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_10d78806b84b97ebc774e9f6277af6ac'] = 'Um Labels zu generieren, müssen Sie eine gültige und registrierte Adresse Ihres Shops auf Ihrer';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_af5efea250326c1c34d69aa9364b482c'] = 'Kontakt-Seite haben';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_fcf5b2122da1d5a5f5c7253b96a3f9d9'] = 'URL Cron Task:';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_362dff77f7403550e886db901404856c'] = 'Löschen erfolgreich';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_66661dacf33146201b60dc16520ddd68'] = 'Fügen Sie eine Versandart hinzu';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_b651efdb98a5d6bd2b3935d0c3f4a5e2'] = 'Erforderlich';
@@ -66,17 +64,12 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_907eba32d950bfab68227fd7ea22999
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_0c24ec05a02c710cedd400e3680d8b81'] = 'Versandart-Liste';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_14039af96b01e718a9c9d9c1259b6472'] = 'Keine Versandmethoden erstellt';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_8596361cec00f8d2438d264827eee737'] = 'Versand konfigurieren';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_fcf5b2122da1d5a5f5c7253b96a3f9d9'] = 'URL Cron Task:';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_f4f70727dc34561dfde1a3c529b6205c'] = 'Einstellungen';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_d02bbc3cb147c272b0445ac5ca7d1a36'] = 'Bestellstatus';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_818f954f4838ecad839c5dcbd287d291'] = 'Wählen Sie den Bestellstatus für Marken. Sie können die Marken auf';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_5117e194c641ad4fc55417b554aead3c'] = 'der Mondial Relay Verwaltungsseite verwalten';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_235072af42d72915159f0e6c9d6a870c'] = 'Google map';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Aktiviert';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_93cba07454f06a4a960172bbd6e2a435'] = 'Ja';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_b9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Nein';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_9c5c09beb32c36129b857c2a40c861b6'] = 'Anzeige einer Google-Karte auf Ihre Mondial Relay Lieferantenseite, kann das Laden der Lieferantenseite verlangsameN';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_1ba3935c9858ffb8e19a35ca640b8505'] = 'Mondial Relay Kontoeinstellungen';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_12a3fbd35c1cab4b1101b91d708efd15'] = 'mr_marke_WebService:';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_6f0434b67007b555dfd1201f4e0d5254'] = 'mr_code_marke:';
@@ -104,12 +97,3 @@ $_MODULE['<{mondialrelay}prestashop>mrgettickets_ea5f761be4e4888eabf4e1501d7817d
 $_MODULE['<{mondialrelay}prestashop>mrgettickets_2653c23b8c0daac59571e4be5e8fa7d0'] = 'Der Webservice von Mondial Relay ist zu r Zeit nicht erreichbar';
 $_MODULE['<{mondialrelay}prestashop>mrmanagement_a42bb0eaa485682166770a54469385f6'] = 'Einige Einträge konnten nicht entfernt werden, bitte versuchen Sie es noch einmal.';
 $_MODULE['<{mondialrelay}prestashop>mrmanagement_11744bfebb33e52be37a66a530b7045d'] = 'Bitte wählen Sie mindestens ein Verlaufselement aus';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_03f4a47830f97377a35321051685071e'] = 'Geschlossen';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_6f8522e0610541f1ef215a22ffa66ff6'] = 'Montag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_5792315f09a5d54fb7e3d066672b507f'] = 'Dienstag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_796c163589f295373e171842f37265d5'] = 'Mitwoch';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_78ae6f0cd191d25147e252dc54768238'] = 'Donnerstag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_c33b138a163847cdb6caeeb7c9a126b4'] = 'Freitag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_8b7051187b9191cdcdae6ed5a10e5adc'] = 'Samstag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_9d1a0949c39e66a0cd65240bc0ac9177'] = 'Sonntag';
-$_MODULE['<{mondialrelay}prestashop>recherchedetailpointrelais_ajax_621895c388c9bb22abbbc69fad001846'] = 'Wählen Sie ein Relay Point aus';
diff --git a/modules/referralprogram/de.php b/modules/referralprogram/de.php
index a28618173..235094736 100644
--- a/modules/referralprogram/de.php
+++ b/modules/referralprogram/de.php
@@ -87,7 +87,6 @@ $_MODULE['<{referralprogram}prestashop>referralprogram_edf7f0a17b8a8f1732f12856f
 $_MODULE['<{referralprogram}prestashop>referralprogram_8465d83b5c1b569299af284c14d957bb'] = 'Gutscheinbeschreibung:';
 $_MODULE['<{referralprogram}prestashop>referralprogram_b17f3f4dcf653a5776792498a9b44d6a'] = 'Einstellungen aktualisieren';
 $_MODULE['<{referralprogram}prestashop>referralprogram_562ad64cf21ac2da656134355115133d'] = 'Ihr Text ist leer.';
-$_MODULE['<{referralprogram}prestashop>referralprogram_01705c0177ebf5fbcbf4e882bc454405'] = 'Referral Programm Regeln';
 $_MODULE['<{referralprogram}prestashop>referralprogram_c5afb9c76a7880978cba32872d01f068'] = 'Aktualisieren Sie den Text';
 $_MODULE['<{referralprogram}prestashop>referralprogram_6b31baf25848e7a6563ecc3946626c80'] = 'Referral Programm';
 $_MODULE['<{referralprogram}prestashop>referralprogram_7790d51a3d62c85aae65464dee12ee8b'] = 'Kundensponsor:';
diff --git a/modules/shopimporter/de.php b/modules/shopimporter/de.php
index a318a5dfd..ab97c8628 100644
--- a/modules/shopimporter/de.php
+++ b/modules/shopimporter/de.php
@@ -59,11 +59,6 @@ $_MODULE['<{shopimporter}prestashop>shopimporter_60474e812295a5adc371de63dc62a16
 $_MODULE['<{shopimporter}prestashop>shopimporter_05f4be265d59ea66f3a1fb12ba103583'] = 'Wählen Sie Ihren Import';
 $_MODULE['<{shopimporter}prestashop>shopimporter_961f2247a2070bedff9f9cd8d64e2650'] = 'Wählen';
 $_MODULE['<{shopimporter}prestashop>shopimporter_151a0fbfcc4894aa53335091c2512de5'] = 'Kein Import-Modul installiert';
-$_MODULE['<{shopimporter}prestashop>shopimporter_9aa1b03934893d7134a660af4204f2a9'] = 'Server';
-$_MODULE['<{shopimporter}prestashop>shopimporter_8f9bfe9d1345237cb3b2b205864da075'] = 'Benutzer';
-$_MODULE['<{shopimporter}prestashop>shopimporter_dc647eb65e6711e155375218212b3964'] = 'Kennwort';
-$_MODULE['<{shopimporter}prestashop>shopimporter_e307db07b3975fef922a80d07455ee5e'] = 'Datenbank';
-$_MODULE['<{shopimporter}prestashop>shopimporter_dac130bdd2c5492a8108a4145bd9f04a'] = 'Datenbank-Präfix';
 $_MODULE['<{shopimporter}prestashop>shopimporter_2bb4cbbf4c51025867d47131e79ad05f'] = 'Nächster Schritt';
 $_MODULE['<{shopimporter}prestashop>shopimporter_72dd98a453e92ccc01697f29bb5dbeb9'] = 'Import-Optionen';
 $_MODULE['<{shopimporter}prestashop>shopimporter_9dfc5d5738312210c3c75e68a468691d'] = 'Advanced-Optionen';
diff --git a/modules/socolissimo/de.php b/modules/socolissimo/de.php
index e54dade46..ba7a748f1 100644
--- a/modules/socolissimo/de.php
+++ b/modules/socolissimo/de.php
@@ -57,7 +57,6 @@ $_MODULE['<{socolissimo}prestashop>socolissimo_00d23a76e43b46dae9ec7aa9dcbebb32'
 $_MODULE['<{socolissimo}prestashop>socolissimo_b9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert';
 $_MODULE['<{socolissimo}prestashop>socolissimo_fdd526b84abc0b8fc17060e62d022b84'] = 'Verfügbarkeit von Service SoColissimo erlauben oder nicht erlauben ';
 $_MODULE['<{socolissimo}prestashop>socolissimo_32996bdf4214d6cb8bf7fa02273813c8'] = 'URL Kontrolle';
-$_MODULE['<{socolissimo}prestashop>socolissimo_995a56aecac4198b9bc0a17a976561b5'] = 'URL der Kontrolle';
 $_MODULE['<{socolissimo}prestashop>socolissimo_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern';
 $_MODULE['<{socolissimo}prestashop>socolissimo_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Information';
 $_MODULE['<{socolissimo}prestashop>socolissimo_3e387f5ebd657c6372f0594c8226863e'] = 'Hier sind zwei Adressen, die Sie in Ihrem Back Office SoColissimo ausfüllen müssen ';
diff --git a/modules/themeinstallator/de.php b/modules/themeinstallator/de.php
index d28a1ba18..0553cbf76 100644
--- a/modules/themeinstallator/de.php
+++ b/modules/themeinstallator/de.php
@@ -4,7 +4,6 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_fff01a1de50e0559f82501a927654d1b'] = 'Import / Export eines Themas';
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_83ebbd7865677d356ffde5ad7e12784f'] = 'Exportieren oder installieren Sie ein Thema und seine Module auf Ihren Shop';
-$_MODULE['<{themeinstallator}prestashop>themeinstallator_e10ed1f81b51bd4c7f86eeb84bcd1359'] = 'zip ist nicht auf Ihrem Server installiert. Erkundigen Sie sich bei Ihrem Provider.';
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_25b9e1d82d8200d70be2b22a1a283957'] = 'Ein Fehler ist beim Hochladen der Datei aufgetreten.';
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_050991b5b76aad0be75563b7cb93a33e'] = 'Nur zip-Dateien sind erlaubt';
 $_MODULE['<{themeinstallator}prestashop>themeinstallator_57c1ed81b02e5d3361323c7930897295'] = 'Ein Fehler ist beim Kopieren der Datei aufgetreten.';
diff --git a/modules/trustedshops/config.xml b/modules/trustedshops/config.xml
index f4db1361c..85f2b73ce 100755
--- a/modules/trustedshops/config.xml
+++ b/modules/trustedshops/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>trustedshops</name>
 	<displayName><![CDATA[Trusted Shops trust solutions]]></displayName>
-	<version><![CDATA[1.3]]></version>
+	<version><![CDATA[1.3.1]]></version>
 	<description><![CDATA[Build confidence in your online shop with the Trusted Shops quality seal, buyer protection and customer rating.]]></description>
 	<author><![CDATA[]]></author>
 	<tab><![CDATA[payment_security]]></tab>
diff --git a/modules/trustedshops/de.php b/modules/trustedshops/de.php
index 7842c7035..80636a9f9 100644
--- a/modules/trustedshops/de.php
+++ b/modules/trustedshops/de.php
@@ -3,7 +3,7 @@
 global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops Käuferschutz (empfohlen)';
-$_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Käuferschutz ab';
+$_MODULE['<{trustedshops}prestashop>display_products_1107bf75ac50728edbeb497ab803a104'] = 'Käuferschutz bis';
 $_MODULE['<{trustedshops}prestashop>display_products_69db1ddc2a15253abb0a11beb1eae734'] = 'inkl. MwSt.';
 $_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'Die im Käuferschutz enthaltene Trusted Shops Garantie sichert Ihren Online-Kauf ab. Mit der Übermittlung und';
 $_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'Speicherung';
diff --git a/modules/trustedshops/display_products.tpl b/modules/trustedshops/display_products.tpl
index 1999c7150..5eb0a86a7 100644
--- a/modules/trustedshops/display_products.tpl
+++ b/modules/trustedshops/display_products.tpl
@@ -78,7 +78,7 @@ var TS = (function()
 	</div>
 	<div id="ts-list-items">
 		{foreach from=$buyer_protection_items item=product}
-			<p><input id="ts-product-{$product.id_product}" type="checkbox" value="{$product.id_product}" name="item_product"> {l s='Buyer protection from' mod='trustedshops'} {$product.protected_amount_decimal} {$currency_iso_code} ({$price|round:2} {$currency_iso_code} {l s='incl. VAT' mod='trustedshops'})</p>
+			<p><input id="ts-product-{$product.id_product}" type="checkbox" value="{$product.id_product}" name="item_product"> {l s='Buyer protection up to' mod='trustedshops'} {$product.protected_amount_decimal} {$currency_iso_code} ({$price|round:2} {$currency_iso_code} {l s='incl. VAT' mod='trustedshops'})</p>
 		{/foreach}
 		<div id="content_checkout" style="margin-left:100px">
 		<p>{l s='The Trusted Shops Buyer Protection secures your online purchase. I agree to my email address being transferred and' mod='trustedshops'} <b><a href="http://www.trustedshops.com/shop/data_privacy.php?shop_id={$shop_id}" target="_blank">{l s='saved' mod='trustedshops'}</a></b> {l s='for the purposes of Buyer Protection processing by Trusted Shops.' mod='trustedshops'} <b><a href="http://www.trustedshops.com/shop/protection_conditions.php?shop_id={$shop_id}" target="_blank">{l s='Conditions' mod='trustedshops'}</a></b> {l s='for Buyer Protection.' mod='trustedshops'}</p></div>
diff --git a/modules/trustedshops/fr.php b/modules/trustedshops/fr.php
index 61003ecba..23a4e0d79 100644
--- a/modules/trustedshops/fr.php
+++ b/modules/trustedshops/fr.php
@@ -3,7 +3,7 @@
 global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops protection acheteur (recommandée)';
-$_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Protection acheteur jusqu\'à';
+$_MODULE['<{trustedshops}prestashop>display_products_1107bf75ac50728edbeb497ab803a104'] = 'Protection acheteur jusqu\'à';
 $_MODULE['<{trustedshops}prestashop>display_products_69db1ddc2a15253abb0a11beb1eae734'] = 'TVA incluse';
 $_MODULE['<{trustedshops}prestashop>display_products_b3c25d2f94cf87ece3dbb2907318520c'] = 'La protection acheteur Trusted Shops sécurise votre achat en ligne. J’accepte le transfert et la';
 $_MODULE['<{trustedshops}prestashop>display_products_536a056b710e94b16169efd17a4a657b'] = 'sauvegarde';
diff --git a/modules/trustedshops/lib/TSBuyerProtection.php b/modules/trustedshops/lib/TSBuyerProtection.php
index ef77fb0a9..bdf687c5b 100644
--- a/modules/trustedshops/lib/TSBuyerProtection.php
+++ b/modules/trustedshops/lib/TSBuyerProtection.php
@@ -1207,6 +1207,17 @@ class TSBuyerProtection extends AbsTrustedShops
 			TSBuyerProtection::$smarty->assign('onlineshop_name', ConfigurationCore::get('PS_SHOP_NAME'));
 			$url = str_replace(array('#shop_id#', '#shop_name#'), array(TSBuyerProtection::$CERTIFICATE[$lang]['tsID'], urlencode(str_replace('_', '-', ConfigurationCore::get('PS_SHOP_NAME')))), TSBuyerProtection::$certificate_link[$lang]);
 			TSBuyerProtection::$smarty->assign('trusted_shops_url', $url);
+
+			$displayWidget = false;
+			foreach (TSBuyerProtection::$CERTIFICATE as $lang => $certificate)
+			{
+				$certificate = (array)$certificate;
+				if (isset($certificate['tsID']) && $certificate['tsID'] !== '' && $certificate['user'] != '')
+					$displayWidget = true;
+			}
+			if ($displayWidget == false)
+				return '';
+
 			return $this->display(TSBuyerProtection::$module_name, 'seal_of_approval.tpl');
 		}
 	}
@@ -1233,6 +1244,8 @@ class TSBuyerProtection extends AbsTrustedShops
 		// If login parameters missing for the certificate an error occurred
 		if ((TSBuyerProtection::$CERTIFICATE[$lang]['user'] == '' OR TSBuyerProtection::$CERTIFICATE[$lang]['password'] == '') AND TSBuyerProtection::$CERTIFICATE[$lang]['typeEnum'] == 'EXCELLENCE')
 		{
+			return '';
+			// Display here has been deprecated by Trusted Shop
 			return '
 			<p style="color:red;text-align:center;font-size:14px;font-weight:bold;">'
 			.$this->l('The Trusted Shop Buyer Protection needs a login to succeed. Please contact the shop administrator.')
@@ -1347,8 +1360,8 @@ class TSBuyerProtection extends AbsTrustedShops
 		$return = '';
 		if (!empty($this->errors))
 			$return = '<p style="color:red">'.implode('<br />', $this->errors).'</p>';
-		else
-			$return = '<p>'.$this->l('You will receive an e-mail by Trusted Shops about your guarantee number.').'</p>';
+		//else
+		//	$return = '<p>'.$this->l('You will receive an e-mail by Trusted Shops about your guarantee number.').'</p>';
 		return $return;
 	}
 
diff --git a/modules/trustedshops/lib/TrustedShopsRating.php b/modules/trustedshops/lib/TrustedShopsRating.php
index 95831b132..a0537e144 100644
--- a/modules/trustedshops/lib/TrustedShopsRating.php
+++ b/modules/trustedshops/lib/TrustedShopsRating.php
@@ -360,11 +360,11 @@ class TrustedShopsRating extends AbsTrustedShops
 	{
 		$link = '';
 		if (strtolower(Context::getContext()->language->iso_code) == 'de')
-			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="https://www.trustedshops.de/shopbetreiber/kundenbewertung_anmeldung.html?partnerPackage=PrestaShop&ratingProduct=RATING_PRO&et_cid=14en&et_lid=29069" target="_blank">Jetzt bei Trusted Shops anmelden!</a></b></p><br />';
+			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="https://www.trustedshops.de/shopbetreiber/kundenbewertung_anmeldung.html?shopsw=PRESTA&partnerPackage=PrestaShop&ratingProduct=RATING_PRO&et_cid=14en&et_lid=29069" target="_blank">Jetzt bei Trusted Shops anmelden!</a></b></p><br />';
 		if (strtolower(Context::getContext()->language->iso_code) == 'en')
-			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.com/merchants/membership.html?shopsw=PRESTA&et_cid=53&et_lid=3361" target="_blank">Apply now!</a></b></p><br />';
+			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.com/merchants/membership.html?shopsw=PRESTA&partnerPackage=PrestaShop&et_cid=53&et_lid=3361" target="_blank">Apply now!</a></b></p><br />';
 		if (strtolower(Context::getContext()->language->iso_code) == 'fr')
-			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.fr/marchands/tarifs.html?shopsw=PRESTA&et_cid=53&et_lid=3362" target="_blank">Enregistrement Trusted Shops</a></b></p><br />';
+			$link = '<p><b><a style="text-decoration: underline; font-weight: bold; color: #0000CC;" target="_blank" href="http://www.trustedshops.fr/marchands/tarifs.html?shopsw=PRESTA&partnerPackage=PrestaShop&et_cid=53&et_lid=3362" target="_blank">Enregistrement Trusted Shops</a></b></p><br />';
 
 		return '<fieldset>
 					<legend><img src="'.__PS_BASE_URI__.'modules/'.self::$module_name.'/logo.gif" alt="" />'.$this->l('Learn More').'</legend>
@@ -444,6 +444,16 @@ class TrustedShopsRating extends AbsTrustedShops
 		if (Configuration::get('TS_TAB0_DISPLAY_RATING_FRONT_END'))
 			self::$smarty->assign(array('rating_url' => $this->getRatingUrl(), 'language' => Language::getIsoById((int)($params['cookie']->id_lang))));
 		
+		$displayWidget = false;
+		foreach (TSBuyerProtection::$CERTIFICATE as $lang => $certificate)
+		{
+			$certificate = (array)$certificate;
+			if (isset($certificate['tsID']) && $certificate['tsID'] !== '' && $certificate['user'] != '')
+				$displayWidget = true;
+		}
+		if ($displayWidget == false)
+			return '';
+		
 		return $this->display(self::$module_name, 'widget.tpl');
 	}
 	
diff --git a/modules/trustedshops/trustedshops.php b/modules/trustedshops/trustedshops.php
index cc0b38b80..6124ee14c 100644
--- a/modules/trustedshops/trustedshops.php
+++ b/modules/trustedshops/trustedshops.php
@@ -48,7 +48,7 @@ class TrustedShops extends Module
 	{
 		$this->name = 'trustedshops';
 		$this->tab = 'payment_security';
-		$this->version = 1.3;
+		$this->version = '1.3.1';
 
 		parent::__construct();
 
diff --git a/modules/uspscarrier/de.php b/modules/uspscarrier/de.php
index a96fabbfc..d5f505f8d 100644
--- a/modules/uspscarrier/de.php
+++ b/modules/uspscarrier/de.php
@@ -2,7 +2,6 @@
 
 global $_MODULE;
 $_MODULE = array();
-$_MODULE['<{uspscarrier}prestashop>uspscarrier_5947e2ae63c0a33524cf81c44a1db580'] = 'USPS Carrier';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_098087ab799def1028233142cafeeafd'] = 'Bieten Sie Ihren Kunden unterschiedliche Liefermethoden mit USPS';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_883fa0069f4b0454e2277dd567ab3991'] = '\'Gewichtseinheit (la oder kg).\'';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_5a3ceec65d417f5d92c26dbf0dccc00d'] = '\'Maßeinheit (cm oder in).\'';
@@ -26,6 +25,7 @@ $_MODULE['<{uspscarrier}prestashop>uspscarrier_f8320b26d30ab433c5a54546d21f414c'
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f827cf462f62848df37c5e1e94a4da74'] = 'Richtig';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_386aad80d82f8245e9ef80352a2240e8'] = 'Alle Einheiten im Paket';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f35eb2a913a3fd6fd8e661012cf0ebd8'] = 'In eine Einheit pro Paket aufteilen';
+$_MODULE['<{uspscarrier}prestashop>uspscarrier_5947e2ae63c0a33524cf81c44a1db580'] = 'USPS Carrier';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_f57cff5425b6e64843c5f066c5b310d0'] = 'Usps Modulstatus';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_09bdd414ce843927aa3dceadc8bce034'] = 'USPS Carrier ist richtig konfiguriert und online!';
 $_MODULE['<{uspscarrier}prestashop>uspscarrier_ec8b84c83dfee20afa4c2f35245a254b'] = 'USPS Carrier ist noch nicht konfiguriert, Sie müssen:';
diff --git a/themes/prestashop/category-count.tpl b/themes/prestashop/category-count.tpl
new file mode 100644
index 000000000..bf18dda23
--- /dev/null
+++ b/themes/prestashop/category-count.tpl
@@ -0,0 +1,31 @@
+{*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+{if $category->id == 1 OR $nb_products == 0}{l s='There are no products.'}
+{else}
+	{if $nb_products == 1}{l s='There is'}{else}{l s='There are'}{/if}&#160;
+	{$nb_products}&#160;
+	{if $nb_products == 1}{l s='product.'}{else}{l s='products.'}{/if}
+{/if}
\ No newline at end of file
diff --git a/themes/prestashop/category.tpl b/themes/prestashop/category.tpl
index 9fc1bafef..e7fe00d78 100644
--- a/themes/prestashop/category.tpl
+++ b/themes/prestashop/category.tpl
@@ -29,16 +29,14 @@
 
 {if isset($category)}
 	{if $category->id AND $category->active}
-		<h1>{strip}
+
+		<h1>
+			{strip}
 			{$category->name|escape:'htmlall':'UTF-8'}
-			<span>
-				{if $category->id == 1 OR $nb_products == 0}{l s='There are no products.'}
-				{else}
-					{if $nb_products == 1}{l s='There is'}{else}{l s='There are'}{/if}&#160;
-					{$nb_products}&#160;
-					{if $nb_products == 1}{l s='product.'}{else}{l s='products.'}{/if}
-				{/if}
-			</span>{/strip}
+				<span class="category-product-count">
+					{include file="$tpl_dir./category-count.tpl"}
+				</span>
+			{/strip}
 		</h1>
 
 		{if $scenes}
diff --git a/themes/prestashop/product.tpl b/themes/prestashop/product.tpl
index 533c1c67e..805a2f9e0 100644
--- a/themes/prestashop/product.tpl
+++ b/themes/prestashop/product.tpl
@@ -149,7 +149,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 			<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large')}"
 				{if $jqZoomEnabled}class="jqzoom" alt="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'thickbox')}"{else} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" {/if} id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}" />
 		{else}
-			<img src="{$img_prod_dir}{$lang_iso}-default-large.jpg" id="bigpic" alt="" title="{$product->name|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
+			<img src="{$img_prod_dir}{$lang_iso}-default-large.jpg" id="bigpic" alt="" title="{$cover.legend|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
 		{/if}
 		</div>