diff --git a/admin-dev/tabs/AdminModules.php b/admin-dev/tabs/AdminModules.php
index bb8abcd74..3ef65cc33 100644
--- a/admin-dev/tabs/AdminModules.php
+++ b/admin-dev/tabs/AdminModules.php
@@ -60,7 +60,7 @@ class AdminModules extends AdminTab
 		 'i18n_localization' => $this->l('I18n & Localization'), 'merchandizing' => $this->l('Merchandizing'), 'migration_tools' => $this->l('Migration Tools'),
 		 'payments_gateways' => $this->l('Payments & Gateways'), 'payment_security' => $this->l('Payment Security'), 'pricing_promotion' => $this->l('Pricing & Promotion'),
 		 'quick_bulk_update' => $this->l('Quick / Bulk update'), 'search_filter' => $this->l('Search & Filter'), 'seo' => $this->l('SEO'), 'shipping_logistics' => $this->l('Shipping & Logistics'),
-		 'slideshows' => $this->l('Slideshows'), 'smart_shopping' => $this->l('Smart Shopping'), 'social_networks' => $this->l('Social Networks'), 'others'=> $this->l('Other Modules'));
+		 'slideshows' => $this->l('Slideshows'), 'smart_shopping' => $this->l('Smart Shopping'), 'market_place' => $this->l('Market Place'), 'social_networks' => $this->l('Social Networks'), 'others'=> $this->l('Other Modules'));
 		 
 		 $xmlModules = @simplexml_load_file($this->_moduleCacheFile);
 
@@ -80,20 +80,37 @@ class AdminModules extends AdminTab
 	public function postProcess()
 	{
 		global $currentIndex, $cookie;
+
+		$id_employee = (int)($cookie->id_employee);
+		$filter_conf = Configuration::getMultiple(array(
+												'PS_SHOW_TYPE_MODULES_'.$id_employee,
+												'PS_SHOW_COUNTRY_MODULES_'.$id_employee,
+												'PS_SHOW_INSTALLED_MODULES_'.$id_employee,
+												'PS_SHOW_ENABLED_MODULES_'.$id_employee
+												));
+		//reset filtre
+		if (Tools::isSubmit('desactive') && $filter_conf['PS_SHOW_ENABLED_MODULES_'.$id_employee] != 'enabledDisabled')
+			$this->setFilterModules($filter_conf['PS_SHOW_TYPE_MODULES_'.$id_employee], $filter_conf['PS_SHOW_COUNTRY_MODULES_'.$id_employee], $filter_conf['PS_SHOW_INSTALLED_MODULES_'.$id_employee], 'disabled');
 			
+		if (Tools::isSubmit('active') && $filter_conf['PS_SHOW_ENABLED_MODULES_'.$id_employee] != 'enabledDisabled')
+			$this->setFilterModules($filter_conf['PS_SHOW_TYPE_MODULES_'.$id_employee], $filter_conf['PS_SHOW_COUNTRY_MODULES_'.$id_employee], $filter_conf['PS_SHOW_INSTALLED_MODULES_'.$id_employee], 'enabled');
+			
+		if (Tools::isSubmit('uninstall') && $filter_conf['PS_SHOW_INSTALLED_MODULES_'.$id_employee] != 'installedUninstalled')
+			$this->setFilterModules($filter_conf['PS_SHOW_TYPE_MODULES_'.$id_employee], $filter_conf['PS_SHOW_COUNTRY_MODULES_'.$id_employee], 'unistalled', $filter_conf['PS_SHOW_ENABLED_MODULES_'.$id_employee]);
+			
+		if (Tools::isSubmit('install') && $filter_conf['PS_SHOW_INSTALLED_MODULES_'.$id_employee] != 'installedUninstalled')
+			$this->setFilterModules($filter_conf['PS_SHOW_TYPE_MODULES_'.$id_employee], $filter_conf['PS_SHOW_COUNTRY_MODULES_'.$id_employee], 'installed', $filter_conf['PS_SHOW_ENABLED_MODULES_'.$id_employee]);
+		
+		
 		if (Tools::isSubmit('filterModules'))
 		{
-			Configuration::updateValue('PS_SHOW_TYPE_MODULES_'.(int)($cookie->id_employee), Tools::getValue('module_type'));
-			Configuration::updateValue('PS_SHOW_COUNTRY_MODULES_'.(int)($cookie->id_employee), Tools::getValue('country_module_value'));
-			Configuration::updateValue('PS_SHOW_INSTALLED_MODULES_'.(int)($cookie->id_employee), Tools::getValue('module_install'));
-			Configuration::updateValue('PS_SHOW_ENABLED_MODULES_'.(int)($cookie->id_employee), Tools::getValue('module_status'));
+			$this->setFilterModules(Tools::getValue('module_type'), Tools::getValue('country_module_value'), Tools::getValue('module_install'), Tools::getValue('module_status'));
+			Tools::redirectAdmin($currentIndex.'&token='.$this->token);
 		}
 		elseif (Tools::isSubmit('resetFilterModules'))
 		{
-			Configuration::updateValue('PS_SHOW_TYPE_MODULES_'.(int)($cookie->id_employee), 'allModules');
-			Configuration::updateValue('PS_SHOW_COUNTRY_MODULES_'.(int)($cookie->id_employee), 0);
-			Configuration::updateValue('PS_SHOW_INSTALLED_MODULES_'.(int)($cookie->id_employee), 'installedUninstalled');
-			Configuration::updateValue('PS_SHOW_ENABLED_MODULES_'.(int)($cookie->id_employee), 'enabledDisabled');
+			$this->resetFilterModules();
+			Tools::redirectAdmin($currentIndex.'&token='.$this->token);
 		}
 		if (Tools::isSubmit('active'))
 		{
@@ -520,16 +537,17 @@ class AdminModules extends AdminTab
 			if (!empty($filterName))
 				if (stristr($module->name, $filterName) === false AND stristr($module->displayName, $filterName) === false AND stristr($module->description, $filterName) === false)
 					unset($modules[$key]);
-
+		}
+		
+		foreach($modules as $module)
 			$autocompleteList .= Tools::jsonEncode(array(
 				'displayName' => (string)$module->displayName,
 				'desc' => (string)$module->description,
 				'name' => (string)$module->name,
 				'author' => (string)$module->author
 			)).', ';
-		}
-		$autocompleteList = rtrim($autocompleteList, ' ,').'];';
 		
+		$autocompleteList = rtrim($autocompleteList, ' ,').'];';
 		// Display CSS Fancy Box
 		echo '<link href="'._PS_CSS_DIR_.'jquery.fancybox-1.3.4.css" rel="stylesheet" type="text/css" media="screen" />';
 		echo '<script type="text/javascript">'.$autocompleteList.'</script>';
@@ -661,6 +679,7 @@ class AdminModules extends AdminTab
 				$goto = 'others';
 		else
 			$goto = false;
+			
 		echo '
   		<script src="'.__PS_BASE_URI__.'js/jquery/jquery.scrollTo-1.4.2-min.js"></script>
 		<script>
@@ -698,6 +717,7 @@ class AdminModules extends AdminTab
 		 	return false;
 		 });
 		'.(!$goto ? '': '$(\'#'.$goto.'_content\').slideToggle( function (){
+		$(\'#'.$goto.'_img\').attr(\'src\', \'../img/admin/less.png\');
 		'.(!$goto ? '' : '$.scrollTo($("#modgo_'.Tools::getValue('module_name').'"), 300 , 
 		{onAfter:function(){
 			$("#modgo_'.Tools::getValue('module_name').'").fadeTo(100, 0, function (){
@@ -851,6 +871,26 @@ class AdminModules extends AdminTab
 		return file_put_contents($this->_moduleCacheFile, Tools::file_get_contents('http://www.prestashop.com/xml/modules_list.xml'));
 	}
 	
+	private function setFilterModules($module_type, $country_module_value, $module_install, $module_status)
+	{
+		global $cookie;
+		
+		Configuration::updateValue('PS_SHOW_TYPE_MODULES_'.(int)($cookie->id_employee), $module_type);
+		Configuration::updateValue('PS_SHOW_COUNTRY_MODULES_'.(int)($cookie->id_employee), $country_module_value);
+		Configuration::updateValue('PS_SHOW_INSTALLED_MODULES_'.(int)($cookie->id_employee), $module_install);
+		Configuration::updateValue('PS_SHOW_ENABLED_MODULES_'.(int)($cookie->id_employee), $module_status);
+	}
+	
+	private function resetFilterModules()
+	{
+		global $cookie;
+		
+		Configuration::updateValue('PS_SHOW_TYPE_MODULES_'.(int)($cookie->id_employee), 'allModules');
+		Configuration::updateValue('PS_SHOW_COUNTRY_MODULES_'.(int)($cookie->id_employee), 0);
+		Configuration::updateValue('PS_SHOW_INSTALLED_MODULES_'.(int)($cookie->id_employee), 'installedUninstalled');
+		Configuration::updateValue('PS_SHOW_ENABLED_MODULES_'.(int)($cookie->id_employee), 'enabledDisabled');
+	}
+	
 }
 
 
diff --git a/classes/AdminTab.php b/classes/AdminTab.php
index de7f2bb57..bd7e9d377 100644
--- a/classes/AdminTab.php
+++ b/classes/AdminTab.php
@@ -523,7 +523,7 @@ abstract class AdminTabCore
 				if (Validate::isLoadedObject($object = $this->loadObject()) AND isset($this->fieldImageSettings))
 				{
 					// check if request at least one object with noZeroObject
-					if (isset($object->noZeroObject) AND sizeof($taxes = call_user_func(array($this->className, $object->noZeroObject))) <= 1)
+					if (isset($object->noZeroObject) AND sizeof(call_user_func(array($this->className, $object->noZeroObject))) <= 1)
 						$this->_errors[] = Tools::displayError('You need at least one object.').' <b>'.$this->table.'</b><br />'.Tools::displayError('You cannot delete all of the items.');
 					else
 					{
diff --git a/classes/Module.php b/classes/Module.php
index 9562a7084..eb426db1e 100644
--- a/classes/Module.php
+++ b/classes/Module.php
@@ -165,6 +165,27 @@ abstract class ModuleCore
 			WHERE `id_module` = '.(int)($this->id));
 	}
 
+	/**
+	 * This function enable module $name. If an $name is an array, 
+	 * this will enable all of them
+	 * 
+	 * @param array|string $name 
+	 * @return true if succeed
+	 * @since 1.4.1
+	 */
+	public static function enableByName($name) 
+	{
+		if (!is_array($name))
+			$name = array($name);
+
+		foreach ($name as $k=>$v)
+			$name[$k] = '"'.pSQL($v).'"';
+
+		return Db::getInstance()->Execute('
+		UPDATE `'._DB_PREFIX_.'module`
+		SET `active`= 1
+		WHERE `name` IN ('.implode(',',$name).')');
+	}
 	/**
 	 * Called when module is set to active
 	 */
@@ -176,15 +197,34 @@ abstract class ModuleCore
 		WHERE `name` = \''.pSQL($this->name).'\'');
 	}
 	
+	/**
+	 * This function disable module $name. If an $name is an array, 
+	 * this will disable all of them
+	 * 
+	 * @param array|string $name 
+	 * @return true if succeed
+	 * @since 1.4.1
+	 */
+	public static function disableByName($name) 
+	{
+		if (!is_array($name))
+			$name = array($name);
+
+		foreach ($name as $k=>$v)
+			$name[$k] = '"'.pSQL($v).'"';
+
+		return Db::getInstance()->Execute('
+		UPDATE `'._DB_PREFIX_.'module`
+		SET `active`= 0
+		WHERE `name` IN ('.implode(',',$name).')');
+	}
+	
 	/**
 	 * Called when module is set to deactive
 	 */
 	public function disable() 
 	{
-		return Db::getInstance()->Execute('
-		UPDATE `'._DB_PREFIX_.'module`
-		SET `active`= 0
-		WHERE `name` = \''.pSQL($this->name).'\'');
+		return Module::disableByName($this->name);
 	}
 
 	/**
@@ -481,7 +521,7 @@ abstract class ModuleCore
 		$modules = scandir(_PS_MODULE_DIR_);
 		foreach ($modules AS $name)
 		{
-			if (Tools::file_exists_cache($moduleFile = _PS_MODULE_DIR_.'/'.$name.'/'.$name.'.php'))
+			if (Tools::file_exists_cache($moduleFile = _PS_MODULE_DIR_.$name.'/'.$name.'.php'))
 			{
 				if (!Validate::isModuleName($name))
 					die(Tools::displayError().' (Module '.$name.')');
@@ -491,6 +531,33 @@ abstract class ModuleCore
 		return $moduleList;
 	}
 
+	/**
+		* Return non native module
+		*
+		* @param int $position Take only positionnables modules
+		* @return array Modules
+		*/
+	public static function getNonNativeModuleList()
+	{
+		$modulesDirOnDisk = Module::getModulesDirOnDisk();
+
+		$module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'modules_list.xml';
+		$nativeModules = simplexml_load_file($module_list_xml);
+		$nativeModules = $nativeModules->modules;
+		foreach ($nativeModules as $nativeModulesType)
+			if (in_array($nativeModulesType['type'],array('native','partner')))
+			{
+				$arrNativeModules[] = '""';
+				foreach ($nativeModulesType->module as $module)
+					$arrNativeModules[] = '"'.pSQL($module['name']).'"';
+			}
+
+		return Db::getInstance()->ExecuteS('
+			SELECT *
+			FROM `'._DB_PREFIX_.'module` m
+			WHERE name NOT IN ('.implode(',',$arrNativeModules).') ');
+	}
+
 	/**
 		* Return installed modules
 		*
diff --git a/classes/Tax.php b/classes/Tax.php
index a4032faf3..d7f77ef1b 100644
--- a/classes/Tax.php
+++ b/classes/Tax.php
@@ -48,8 +48,6 @@ class TaxCore extends ObjectModel
 	protected static $_product_country_tax = array();
 	protected static $_product_tax_via_rules = array();
 
-	public		$noZeroObject = 'getTaxes';
-
 	public function getFields()
 	{
 		parent::validateFields();
diff --git a/install-dev/controller.js b/install-dev/controller.js
index 84694d42b..c1bf2f20e 100644
--- a/install-dev/controller.js
+++ b/install-dev/controller.js
@@ -37,6 +37,7 @@ validShopInfos = false;
 upgradeCertify = false;
 dropdb=false;
 application="install";
+customModule="desactivate";
 
 function nextTab()
 {
@@ -838,7 +839,7 @@ function doUpgrade()
 	   url: "model.php",
 	   cache: false,
 	   data:
-	   	"method=doUpgrade"
+	   	"method=doUpgrade&customModule=" + customModule+ ""
 	   ,
 	   success: function(ret)
 	   {
@@ -1028,5 +1029,13 @@ $(document).ready(
 		$('#set_license').click(function() {
 			checkLicenseButton(this);
 		});
+		$("#customModuleDesactivation").bind('click',
+			function(){
+				if($("#customModuleDesactivation")[0].checked)
+					customModule = 'desactivate';
+				else
+					customModule = 'take the risk';
+			}
+		)
 	}
 );
diff --git a/install-dev/index.php b/install-dev/index.php
index 938056b77..afb3b61e3 100644
--- a/install-dev/index.php
+++ b/install-dev/index.php
@@ -826,9 +826,43 @@ if ($lm->getIncludeTradFilename())
 				{
 					return strnatcmp($a['version'], $b['version']);
 				}
+			$countNonNative = 0;
+				if ($oldversion !== false)
+				{
+					include_once(realpath(INSTALL_PATH.'/../config').'/settings.inc.php');
+					include_once(realpath(INSTALL_PATH.'/../config').'/config.inc.php');
+					$moduleList = Module::getNonNativeModuleList();
+					$moduleNonNativeLi = '<ul>';
+					foreach($moduleList as $module)
+						if($module['active'])
+						{
+							$countNonNative++;
+							$moduleNonNativeLi .= '<li>'.$module['name'].'</li>';
+						}
+					$moduleNonNativeLi .= '</ul>';	
+				}
+				if($countNonNative)
+				{
+					echo '<br /><br />
+					<h2>'.lang('Module compatibility').'</h2>';
+					echo '<div style="font-weight: bold; background-color: #ffdeb7; color: #000; padding: 10px; border: 1px solid #999; margin-top: 10px;">
+					<p><img src="../img/admin/warning.gif" alt="" style="vertical-align: middle;" /> '.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.').'</p>
+					</div>
+					<p>'.lang('You will be able to manually reactivate them in your back-office, once the update process has succeeded.').'</p>
+					<input id="customModuleDesactivation" type="checkbox" checked="checked" value="1" name="customModuleDesactivation" /> <label for="customModuleDesactivation">'
+					.lang('Ok, please desactivate the following modules, I will reactivate them later.').' : </label>';
+					echo $moduleNonNativeLi;
+	
+				}
+
+				echo '<h2>'.lang('Theme compatibility').'</h2>';
+				echo '<p>'.lang('Before updating, you need to check that your theme is compatible with version').' <b>'.INSTALL_VERSION.'</b> '.lang('of PrestaShop.').'</p>
+	<p><b>'.lang('In this aim, use our').'</b> <a target="_blank" href="http://validator.prestashop.com?version='.INSTALL_VERSION.'" title="'.lang('Link to the validator').'"><b>'.lang('Online Theme Validator').'</b></a>.'.'</p>';
+	echo '<p>'.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 ').' '.INSTALL_VERSION.' '.lang('version').'.</p>';
 				
-				echo '<br /><br />
-				<h2>'.lang('Details about this upgrade').' (v'.INSTALL_VERSION.')</h2>
+				echo '<h2>'.lang('Let\'s go!').'</h2>
+				<p>'.lang('Click on the "Next" button to start the upgrade, this can take several minutes,').' <u style="font-weight: bold; text-decoration: underline;">'.lang('do not close the window and be patient.').'</u></p>';
+				echo '<h2>'.lang('Details about this upgrade').' (v'.INSTALL_VERSION.')</h2>
 				<p>'.
 				lang('Thank you, you will be able to continue the upgrade process by clicking on the "Next" button.').'<br /><br />'.
 				lang('PrestaShop is upgrading your shop one version after the other, the following upgrade files will be processed:').'
@@ -938,10 +972,8 @@ if ($lm->getIncludeTradFilename())
 					echo '<img src="../img/admin/error2.png" alt="" style="vertical-align: middle;" /> '.lang('We strongly recommend that you inform your hosting provider to modify the settings before process to the update.');
 					
 				echo '
-				</div><br />
+				</div><br />';
 				
-				<h2>'.lang('Let\'s go!').'</h2>
-				<p>'.lang('Click on the "Next" button to start the upgrade, this can take several minutes,').' <u style="font-weight: bold; text-decoration: underline;">'.lang('do not close the window and be patient.').'</u></p>';
 				
 				?>
 			</div>
@@ -1034,6 +1066,11 @@ if ($lm->getIncludeTradFilename())
 					<span class="description"><?php echo lang('Find your store as your future customers will see!'); ?></span>
 					<span class="message"><?php echo lang('Discover your store'); ?></span>
 				</a>
+				<span href="#" id="access" class="BO" target="_blank">
+					<span class="title"><?php echo lang('Back Office'); ?></span>
+					<span class="description"><?php echo lang('Manage your store with your back office. Manage your orders and customers, add modules, change your theme, etc...'); ?></span>
+					<span class="message"><?php echo lang('Manage your store'); ?></span>
+				</span>
 			</div>
 			<?php
 			if (@fsockopen('addons.prestashop.com', 80, $errno, $errst, 3)): ?>
diff --git a/install-dev/langs/fr.php b/install-dev/langs/fr.php
index f8720ff8e..c4cb53f1e 100644
--- a/install-dev/langs/fr.php
+++ b/install-dev/langs/fr.php
@@ -267,4 +267,19 @@ $_LANG['Your update is completed!'] = 'Votre mise à jour est terminée !';
 $_LANG['Your shop version is now'] = 'La version de votre boutique est maintenant';
 $_LANG['New features in PrestaShop v'] = 'Nouvelles fonctionnalités dans PrestaShop v';
 $_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).'] = 'Attention, votre paramètres semblent corrects mais ne sont pas optimaux, si jamais vous rencontrez des soucis (mise à jour qui se bloque avant la fin, erreur de mémoire...), merci de demander à votre hébergeur d\'augmenter les valeurs de ces paramètres (max_execution_time & memory_limit).';
-$_LANG['We strongly recommend that you inform your hosting provider to modify the settings before process to the update.'] = 'Nous vous recommandons fortement de prévenir votre hébergeur avant de procéder à la mise à jour afin qu\'il modifie ces paramètres PHP.';
\ No newline at end of file
+$_LANG['We strongly recommend that you inform your hosting provider to modify the settings before process to the update.'] = 'Nous vous recommandons fortement de prévenir votre hébergeur avant de procéder à la mise à jour afin qu\'il modifie ces paramètres PHP.';
+$_LANG['Module compatibility'] = 'Compatibilité Modules';
+$_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.'] = 'Il est déconseillé de laisser les modules non natif activé durant la mise à jour? Si vous voulez réellement prendre ce risque, désactivez la case suivante.';
+$_LANG['You will be able to manually reactivate them in your back-office, once the update process has succeeded.'] = 'Vous pourrez ensuite les réactiver manuellement dans le back-office, une fois le processus de mise à jour terminé.';
+$_LANG['Ok, please desactivate the following modules, I will reactivate them later.'] = 'D\'accord, désactivez automatiquement les modules suivant, je les réactiverait moi-même plus tard.';
+$_LANG['Theme compatibility'] = 'Compatibilité du thème';
+$_LANG['Before updating, you need to check that your theme is compatible with version'] = 'Avant la mise à jour, vous avez besoin de vérifier que votre thème reste compatible avec la version';
+$_LANG['of PrestaShop.'] = 'de PrestaShop';
+$_LANG['Link to the validator'] = 'Lien vers le validateur';
+$_LANG['Online Theme Validator'] = 'Validateur de Theme en ligne';
+$_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 votre thème n\'est pas valide, vous pourrez rencontrer quelques problèmes d\'affichage de votre site, mais inutile de paniquer ! Vous pouvez le rendre compatible en corrigeant les erreurs signalées par le validateur ou en utilisant un thème compatible avec la version' ;
+$_LANG['version'] = '';
+
+
+
+
diff --git a/install-dev/php/desactivatecustommodules.php b/install-dev/php/desactivatecustommodules.php
new file mode 100644
index 000000000..e44ea3431
--- /dev/null
+++ b/install-dev/php/desactivatecustommodules.php
@@ -0,0 +1,71 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 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/osl-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: 1.4 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+function desactivate_custom_modules()
+{
+	// Get all modules then select only payment ones
+	$arrInstalledModules = Module::getModulesInstalled();
+	// get native module list 
+	$module_list_xml = INSTALL_PATH.'/../config/modules_list.xml';
+	$nativeModules = simplexml_load_file($module_list_xml);
+	$nativeModules = $nativeModules->modules;
+	if ($nativeModules['type'] == 'native')
+	{
+		foreach ($nativeModules->module as $module)
+			$arrNativeModules[] = $module['name'].'';
+	}
+	$uninstallMe = array("rien");
+	foreach($arrInstalledModules as $aModule)
+	{
+		if(!in_array($aModule['name'],$arrNativeModules))
+		{
+			$uninstallMe[] = $aModule['name'];
+		}
+	}
+	Module::disableByName($uninstallMe);
+	foreach ($modules AS $module)
+	{
+		$file = _PS_MODULE_DIR_.$module['name'].'/'.$module['name'].'.php';
+		if (!file_exists($file))
+			continue;
+		$fd = fopen($file, 'r');
+		if (!$fd)
+			continue ;
+		$content = fread($fd, filesize($file));
+		if (preg_match_all('/extends PaymentModule/U', $content, $matches))
+		{
+			Db::getInstance()->Execute('
+			INSERT INTO `'._DB_PREFIX_.'module_country` (id_module, id_country)
+			SELECT '.(int)($module['id_module']).', id_country FROM `'._DB_PREFIX_.'country` WHERE active = 1');
+			Db::getInstance()->Execute('
+			INSERT INTO `'._DB_PREFIX_.'module_currency` (id_module, id_currency)
+			SELECT '.(int)($module['id_module']).', id_currency FROM `'._DB_PREFIX_.'currency` WHERE deleted = 0');
+		}
+		fclose($fd);
+	}
+}
+
+
diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql
index 62709cac4..02732a6db 100644
--- a/install-dev/sql/db_settings_lite.sql
+++ b/install-dev/sql/db_settings_lite.sql
@@ -801,7 +801,7 @@ INSERT INTO `PREFIX_meta_lang` (`id_meta`, `id_lang`, `title`, `description`, `k
 (5, 4, 'Hersteller', 'Herstellerliste', 'Hersteller', 'hersteller'),
 (6, 4, 'Neue Produkte', 'Unsere neuen Produkte', 'neu, Produkte', 'neue-Produkte'),
 (7, 4, 'Kennwort vergessen', 'Geben Sie die E-Mailadresse ein, die Sie zum Einloggen benutzen, damit Sie eine E-Mail mit dem neuen Kennwort erhalt', 'vergessen, Kennwort, E-Mail, neu, Reset', 'kennwort-wiederherstellung'),
-(8, 4, 'Preise fallen', 'Unsere Sonderangebote', 'besonders, Preise fallen', 'preise-fallen'),
+(8, 4, 'Angebote', 'Unsere Sonderangebote', 'besonders, Angebote', 'angebote'),
 (9, 4, 'Sitemap', 'Verloren? Finden Sie, was Sie suchen', 'sitemap', 'sitemap'),
 (10, 4, 'Zulieferer', 'Zuliefererliste', 'Zulieferer', 'zulieferer'),
 (11, 4, 'Adresse', '', '', 'adresse'),
diff --git a/install-dev/sql/upgrade/1.4.1.0.sql b/install-dev/sql/upgrade/1.4.1.0.sql
index d49cab601..fb31d2862 100755
--- a/install-dev/sql/upgrade/1.4.1.0.sql
+++ b/install-dev/sql/upgrade/1.4.1.0.sql
@@ -19,4 +19,9 @@ UPDATE `PREFIX_cms_lang` set link_rewrite = "uber-uns" where link_rewrite like "
 
 ALTER TABLE `PREFIX_connections` CHANGE `ip_address` `ip_address` BIGINT NULL DEFAULT NULL;
 
+
+UPDATE `PREFIX_meta_lang`
+SET `title` = 'Angebote', `keywords` = 'besonders, Angebote', `url_rewrite` = 'angebote' WHERE url_rewrite = 'preise-fallen';
+
+
 /* PHP:alter_cms_block(); */;
diff --git a/install-dev/view.css b/install-dev/view.css
index 7fb954a49..9a80bfbfd 100644
--- a/install-dev/view.css
+++ b/install-dev/view.css
@@ -541,7 +541,7 @@ div#noJavaScript{
 	text-align: center;
 }
 
-a#access, a#access_update{
+a#access, a#access_update, span#box_admin{
 	display:block;
 	width:300px;
 	height:150px;
diff --git a/install-dev/xml/doUpgrade.php b/install-dev/xml/doUpgrade.php
index 750ec4edb..94f5c42b7 100644
--- a/install-dev/xml/doUpgrade.php
+++ b/install-dev/xml/doUpgrade.php
@@ -33,7 +33,8 @@ if (function_exists('date_default_timezone_set'))
 
 define('_PS_MODULE_DIR_', realpath(INSTALL_PATH).'/../modules/');
 define('_PS_INSTALLER_PHP_UPGRADE_DIR_', 'php/');
-
+// desactivate non-native module 
+require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'desactivatecustommodules.php');
 // utf-8 conversion if needed (before v0.9.8.1 utf-8 was badly supported)
 require_once(_PS_INSTALLER_PHP_UPGRADE_DIR_.'utf8.php');
 // Configuration cleaner in order to get unique configuration names
@@ -196,6 +197,9 @@ if(!defined('_MYSQL_ENGINE_'))
 	define('_MYSQL_ENGINE_', 'MyISAM');
 
 $sqlContent = '';
+if(isset($_GET['customModule']) AND $_GET['customModule'] == 'desactivate')
+	desactivate_custom_modules();
+
 foreach($neededUpgradeFiles AS $version)
 {
 	$file = INSTALL_PATH.'/sql/upgrade/'.$version.'.sql';
diff --git a/mails/de/bankwire.txt b/mails/de/bankwire.txt
index 00ffa4734..b754c825e 100644
--- a/mails/de/bankwire.txt
+++ b/mails/de/bankwire.txt
@@ -13,7 +13,7 @@ Bitte beachten Sie, dass Sie die Bank
 Gesamtbetrag der Bestellung ist {total_paid}
 
 Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.
-Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}guest-tracking.php
+Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}gast-bestellverfolgung.php
 
 Danke f�r Ihren Einkauf bei {shop_name}.
 
diff --git a/mails/de/cheque.txt b/mails/de/cheque.txt
index 2e80856c3..73c56a2d9 100644
--- a/mails/de/cheque.txt
+++ b/mails/de/cheque.txt
@@ -11,7 +11,7 @@ Bitte beachten Sie, dass Sie die Zahlung per Scheck gew
 - Adresse {cheque_address}
 
 Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.
-Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}guest-tracking.php
+Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}gast-bestellverfolgung.php
 
 Danke f�r Ihren Einkauf bei {shop_name}.
 
diff --git a/mails/de/download_product.txt b/mails/de/download_product.txt
index 1f8509404..b801cf96f 100644
--- a/mails/de/download_product.txt
+++ b/mails/de/download_product.txt
@@ -6,6 +6,6 @@ Hier sind direkte Links zu diesen Produkten:
 {virtualProducts}
 
 Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. 
-Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen: {shop_url}guest-tracking.php
+Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen: {shop_url}gast-bestellverfolgung.php
 
 {shop_url} powered by PrestaShop™
diff --git a/mails/de/in_transit.txt b/mails/de/in_transit.txt
index 710c72abc..a00bb266c 100644
--- a/mails/de/in_transit.txt
+++ b/mails/de/in_transit.txt
@@ -5,7 +5,7 @@ Ihre Bestellung ist derzeit auf dem Weg.
 Sie k�nnen Ihr Paket verfolgen, indem Sie auf den folgenden Link klicken: {followup}
 
 Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. 
-Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen: {shop_url}guest-tracking.php
+Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen: {shop_url}gast-bestellverfolgung.php
 
 Danke f�r Ihren Einkauf bei {shop_name}.
 
diff --git a/mails/de/log_alert.html b/mails/de/log_alert.html
index b9fd79b99..7c8289dff 100755
--- a/mails/de/log_alert.html
+++ b/mails/de/log_alert.html
@@ -5,42 +5,42 @@
 	<title>Message from {shop_name}</title>
 </head>
 <body>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
-<tbody>
-<tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td align="left">Hallo,</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Neue Log-Warnung</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td align="left"><strong>Leider wurde eine neue Log-Warnung gespeichert.</strong></td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td align="left">Sie k&ouml;nnen sie einsehen in Ihrem Back Office &gt; Tools &gt; Anmeldung auf Ihrer Website.</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> unterst&uuml;tzt von <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
-</tr>
-</tbody>
+	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+<tbody>
+<tr>
+<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+</tr>
+<tr>
+<td>&nbsp;</td>
+</tr>
+<tr>
+<td align="left">Hallo,</td>
+</tr>
+<tr>
+<td>&nbsp;</td>
+</tr>
+<tr>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Neue Log-Warnung</td>
+</tr>
+<tr>
+<td>&nbsp;</td>
+</tr>
+<tr>
+<td align="left"><strong>Leider wurde eine neue Log-Warnung gespeichert.</strong></td>
+</tr>
+<tr>
+<td>&nbsp;</td>
+</tr>
+<tr>
+<td align="left">Sie k&ouml;nnen sie einsehen in Ihrem Back Office &gt; Tools &gt; Anmeldung auf Ihrer Website.</td>
+</tr>
+<tr>
+<td>&nbsp;</td>
+</tr>
+<tr>
+<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> unterst&uuml;tzt von <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+</tr>
+</tbody>
 </table>
 </body>
 </html>
\ No newline at end of file
diff --git a/mails/de/log_alert.txt b/mails/de/log_alert.txt
index fdba87e8d..7d932068b 100755
--- a/mails/de/log_alert.txt
+++ b/mails/de/log_alert.txt
@@ -1,10 +1,10 @@
-Hallo,
-		
-Neue Log-Warnung
-	
-Leider wurde eine neue Log-Warnung gespeichert.
-
-Sie können sie einsehen in Ihrem Back Office > Tools > Anmeldung auf Ihrer Website.		
-{shop_name} - {shop_url}
-
-{shop_url} powered by PrestaShop™
+Hallo,
+		
+Neue Log-Warnung
+	
+Leider wurde eine neue Log-Warnung gespeichert.
+
+Sie können sie einsehen in Ihrem Back Office > Tools > Anmeldung auf Ihrer Website.		
+{shop_name} - {shop_url}
+
+{shop_url} powered by PrestaShop™
diff --git a/mails/de/order_canceled.txt b/mails/de/order_canceled.txt
index 4fa46b3a8..c075692fb 100644
--- a/mails/de/order_canceled.txt
+++ b/mails/de/order_canceled.txt
@@ -5,7 +5,7 @@ Zu Ihrer Bestellung Nr.{id_order}:
 Ihre Bestellung wurde abgebrochen.
 
 Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. 
-Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}guest-tracking.php
+Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}gast-bestellverfolgung.php
 
 {shop_name} - {shop_url}
 
diff --git a/mails/de/outofstock.txt b/mails/de/outofstock.txt
index d1844189f..3de3fde89 100644
--- a/mails/de/outofstock.txt
+++ b/mails/de/outofstock.txt
@@ -5,7 +5,7 @@
 Leider sind ein oder mehrere Artikel aus Ihrer Bestellung Nr. {id_order} derzeit nicht auf Lager. Dies kann zu einer leichten Verz�gerung bei Auslieferung f�hren. Wir entschuldigen uns und versichern Ihnen, dass wir alles daf�r tun werden, um dies zu �ndern.
 
 Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.
-Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}guest-tracking.php
+Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}gast-bestellverfolgung.php
 		
 	{shop_name} - {shop_url}
 
diff --git a/mails/de/payment_error.txt b/mails/de/payment_error.txt
index 555f1c166..d8138bed2 100644
--- a/mails/de/payment_error.txt
+++ b/mails/de/payment_error.txt
@@ -5,7 +5,7 @@ Es ist ein Problem bei Ihrer Zahlung der Bestellung Nr. {id_order} aufgetreten.
 Ihre Bestellung wird nicht versandt, bis wir dieses Problem gel�st haben. 
 
 Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf"Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.
-Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}guest-tracking.php
+Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}gast-bestellverfolgung.php
 
 {shop_name} - {shop_url}
 
diff --git a/mails/de/preparation.txt b/mails/de/preparation.txt
index 63a8520c7..4507faf47 100644
--- a/mails/de/preparation.txt
+++ b/mails/de/preparation.txt
@@ -5,7 +5,7 @@
 	Wir sind in der Bearbeitung Ihrer Bestellung.
 
 	Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.
-	Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}guest-tracking.php
+	Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}gast-bestellverfolgung.php
 	
 	{shop_name} - {shop_url}
 
diff --git a/mails/de/refund.txt b/mails/de/refund.txt
index 2608a6070..b4eaf3d65 100644
--- a/mails/de/refund.txt
+++ b/mails/de/refund.txt
@@ -3,7 +3,7 @@
 	Ihr Bestellbetrag wurde r�ckerstattet.
 
 	Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken.
-	Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}guest-tracking.php
+	Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}gast-bestellverfolgung.php
 
 	{shop_name} - {shop_url}
 
diff --git a/mails/de/shipped.txt b/mails/de/shipped.txt
index 710d17733..8608882c3 100644
--- a/mails/de/shipped.txt
+++ b/mails/de/shipped.txt
@@ -5,7 +5,7 @@ Ihre Bestellung wurde soeben versendet.
 Sie erhalten in K�rze eine URL, auf die Sie klicken k�nnen, um den Lieferfortschritt Ihrer Sendung zu verfolgen.
 
 Sie k�nnen diese Bestellung ansehen und Ihre Rechnung aus dem Abschnitt "Bestellverlauf" Ihres Kontos downloaden, indem Sie auf unserer Webseite auf "Mein Konto" klicken. 
-Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}guest-tracking.php
+Wenn Sie ein Gast-Konto haben, k�nnen Sie Ihre Bestellung auf dieser Webseite verfolgen. {shop_url}gast-bestellverfolgung.php
 
 Danke f�r Ihren Einkauf bei {shop_name}.
 
diff --git a/modules/hipay/hipay.php b/modules/hipay/hipay.php
index 73eb5ba35..0b35d2cbb 100644
--- a/modules/hipay/hipay.php
+++ b/modules/hipay/hipay.php
@@ -339,7 +339,7 @@ class Hipay extends PaymentModule
     <fieldset><legend><img src="../modules/'.$this->name.'/logo.gif" /> '.$this->l('Hipay').'</legend>
     '.$this->l('Hipay is a secure electronic wallet which has the European Bank approval. Hipay offer you many opportunities without need to negotiate with a bank. Easy and free to use, Hipay\'s solution of the implementation is a real asset for an e-commerce website that wants to expand in Europe: secure payment by international card, local payment solutions, bank transfers...').'
 			<br />
-			<br />'.$this->l('Notice: if you want to refund a payment, please log in to your Hipay account then go to Merchant Management > Sales management.').'
+			<!-- <br />'.$this->l('Notice: if you want to refund a payment, please log in to your Hipay account then go to Merchant Management > Sales management.').'-->
 		</fieldset>
 		<div class="clear">&nbsp;</div>
 		<fieldset><legend><img src="../modules/'.$this->name.'/logo.gif" /> '.$this->l('Configuration').'</legend>
diff --git a/modules/producttooltip/config.xml b/modules/producttooltip/config.xml
index b5ae32698..4e5ca4763 100755
--- a/modules/producttooltip/config.xml
+++ b/modules/producttooltip/config.xml
@@ -8,4 +8,5 @@
 	<tab>front_office_features</tab>
 	<is_configurable>1</is_configurable>
 	<need_instance>1</need_instance>
+	<limited_countries></limited_countries>
 </module>
\ No newline at end of file
diff --git a/modules/producttooltip/fr.php b/modules/producttooltip/fr.php
index 160c853b1..5aa05014d 100644
--- a/modules/producttooltip/fr.php
+++ b/modules/producttooltip/fr.php
@@ -10,6 +10,7 @@ $_MODULE['<{producttooltip}prestashop>producttooltip_93cba07454f06a4a960172bbd6e
 $_MODULE['<{producttooltip}prestashop>producttooltip_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non';
 $_MODULE['<{producttooltip}prestashop>producttooltip_2c8de3180924949acc5f6250af689802'] = 'Période de validité :';
 $_MODULE['<{producttooltip}prestashop>producttooltip_640fd0cc0ffa0316ae087652871f4486'] = 'minutes';
+$_MODULE['<{producttooltip}prestashop>producttooltip_8a8110f8a25a0e445f51edf84fd98a96'] = 'Si vous activez l\'option ci-dessus, vous devez activer la première option du module StatData';
 $_MODULE['<{producttooltip}prestashop>producttooltip_1e358b149c2d4105f3a74c1961d1d9fb'] = 'Afficher la date de la dernière commande ?';
 $_MODULE['<{producttooltip}prestashop>producttooltip_69cd5a64d37c70989558b58f0b484fb3'] = 'Si aucune commande à afficher, afficher la date du dernier ajout au panier ?';
 $_MODULE['<{producttooltip}prestashop>producttooltip_a536f110cc080569666e95e8f49fda9b'] = 'Ne pas afficher les événements datant de plus de :';
diff --git a/modules/producttooltip/producttooltip.php b/modules/producttooltip/producttooltip.php
index 3add67927..f70d7d501 100644
--- a/modules/producttooltip/producttooltip.php
+++ b/modules/producttooltip/producttooltip.php
@@ -93,12 +93,14 @@ class ProductToolTip extends Module
 				'.$this->l('Display the number of people who are currently watching this product?').'<br /><br />
 				<img src="'._PS_ADMIN_IMG_.'enabled.gif" alt="" /><input type="radio" name="ps_ptooltip_people" value="1"'.(Configuration::get('PS_PTOOLTIP_PEOPLE') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('Yes').' 
 				&nbsp;<img src="'._PS_ADMIN_IMG_.'disabled.gif" alt="" /><input type="radio" name="ps_ptooltip_people" value="0"'.(!Configuration::get('PS_PTOOLTIP_PEOPLE') ? ' checked="checked"' : '').' style="vertical-align: middle;" /> '.$this->l('No').'<br />
-				
 			</p>
 			<p>
 				'.$this->l('Lifetime:').'
 				<input type="text" name="ps_ptooltip_lifetime" style="width: 30px;" value="'.(int)(Configuration::get('PS_PTOOLTIP_LIFETIME')).'" /> '.$this->l('minutes').'<br />
 			</p>
+			<p>
+				'.$this->l('If you activate the option above, you must activate the first option of StatData module').'
+			</p>
 			<hr size="1" noshade />			
 			<p>
 				'.$this->l('Display the last time the product has been ordered?').'<br /><br />
diff --git a/modules/trustedshops/es.php b/modules/trustedshops/es.php
index 4218fc954..a6fefa7f7 100644
--- a/modules/trustedshops/es.php
+++ b/modules/trustedshops/es.php
@@ -4,9 +4,6 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Trusted Shops protección comprador (recomendado)';
 $_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Protección comprador hasta';
-$_MODULE['<{trustedshops}prestashop>display_products_bc500dd033a84b00ffd9f81a8a9d5372'] = 'durante';
-$_MODULE['<{trustedshops}prestashop>display_products_44fdec47036f482b68b748f9d786801b'] = 'días';
-$_MODULE['<{trustedshops}prestashop>display_products_ee430460ed8c2e7099df4947287e65c6'] = 'La protección comprador Trusted Shop hace que su compra en línea sea segura. Acepto que Trusted Shopss transfiera y guarde mi dirección email para el tratamiento de la protección comprador. Condiciones para la protección comprador. ';
 $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_7b5406da2d5f15923d6b01d3264c5619'] = 'Cuño Trusted Shops- Pulse aquí para comprobar';
 $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_4052048c767f22e9071c3e6f404d00c6'] = 'Como miembro de Trusted Shops, le ofrecemos un servicio complementario excepcional: la garantía de reembolso Trusted Shops. ';
 $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_f975f42362625cf21e592009ff4b3d7b'] = 'Inscríbase para obtener la garantía de reembolso de Trusted Shops. ';
@@ -95,16 +92,13 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8dd66ca6788218bd7d2ba7fe43
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_26286e2764ccde55c99d1b258315aa1a'] = 'Puede proponer a sus clientes en línea un argumento importante: la protección comprador Trusted Shops que asegura al cliente en caso de no reembolso o si no reciba la mercancía. Este seguro suplementario permite reducir la interrupción de los pedidos. ';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_710142158c105c01ef807ce959cbc451'] = 'Una fidelización clientela fructuosa y durable';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f7e15d97ad927ef705de61e787883ada'] = 'Para aumentar las compras en línea, el sello de calidad Trusted Shops con protección comprador es un criterio de calidad durable para compras en línea seguras. Es una manera de transformar clientes únicos en clientes fieles. ';
-$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_0f27ca369d9fee1f5e00f8277c52b014'] = 'Precise el entorno que utiliza para el API de Trusted Shops protección comprador';
-$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_6b5690a29af233c9f94d6478850e5da5'] = 'Entorno de test';
-$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_98b40dff6ec06a4ef28071fc8725b474'] = 'Entorno de producción';
-$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_2541d938b0a58946090d7abdde0d3890'] = 'enviar';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_dc62561dd8d390e274487516e869fc93'] = 'Obtenir el link de registro';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_5c93149208b3885248b960eb22e6ba49'] = 'Esta variable ha sido enviada por email por Tructed Shops';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_233a96df2f68dbeafaa3126edadc1ce8'] = 'Identificación interna del software de la tienda en Trusted Shops';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_261720a5c993fb1cfad560d874d06254'] = 'Canal del Etracker';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_02977dc4b8561c8d7312b1931782c36b'] = 'Campaña del Etrackter';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_4994a8ffeba4ac3140beb89e8d41f174'] = 'Idioma';
+$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_2541d938b0a58946090d7abdde0d3890'] = 'enviar';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_72ca0dcf49befb037f8d4734ee0a2a1c'] = 'Añadir un certificado Trusted Shops';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_48e31908bfdcda34b0f01cad9d7077af'] = 'Nuevo certificado';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_75904cf055527a97739601e0f5ff7e51'] = 'Añadir el';
diff --git a/modules/trustedshops/it.php b/modules/trustedshops/it.php
index cac8ab1d5..d38874f23 100644
--- a/modules/trustedshops/it.php
+++ b/modules/trustedshops/it.php
@@ -4,9 +4,7 @@ global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{trustedshops}prestashop>display_products_02ecb4a4709d9bcc590f1a25fc82c0e2'] = 'Protezione acquirente Trusted Shops (consigliato)';
 $_MODULE['<{trustedshops}prestashop>display_products_b55aab8932a39ca85bb0a1b6eb83f83f'] = 'Protezione acquirente da';
-$_MODULE['<{trustedshops}prestashop>display_products_bc500dd033a84b00ffd9f81a8a9d5372'] = 'durante';
-$_MODULE['<{trustedshops}prestashop>display_products_44fdec47036f482b68b748f9d786801b'] = 'giorni';
-$_MODULE['<{trustedshops}prestashop>display_products_ee430460ed8c2e7099df4947287e65c6'] = 'La Protezione acquirente Trusted Shops protegge i tuoi acquisti online. Accetto che il mio indirizzo e-mail venga trasferito e salvato ai fini del trattamento Protezione acquirente da parte di Trusted Shops. Condizioni per la protezione dell\'acquirente.';
+$_MODULE['<{trustedshops}prestashop>display_products_a53a5a9f38f31d62a791717b943e02f3'] = 'EUR incl. IVA';
 $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_7b5406da2d5f15923d6b01d3264c5619'] = 'Sigillo di Approvazione Trusted Shops  - Clicca per verificare.';
 $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_4052048c767f22e9071c3e6f404d00c6'] = 'Ti offriamo la Protezione acquirente di Trusted Shop come servizio aggiuntivo. Copriamo tutti i costi per questa garanzia. Tutto quello che devi fare è registrarti!';
 $_MODULE['<{trustedshops}prestashop>order-confirmation-tsbp-classic_f975f42362625cf21e592009ff4b3d7b'] = 'Registrati per la Protezione acquirente Trusted shops';
@@ -95,16 +93,13 @@ $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_8dd66ca6788218bd7d2ba7fe43
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_26286e2764ccde55c99d1b258315aa1a'] = 'Dai ai tuoi clienti online una ragione per acquistare, proponendo la Protezione acquirenti di Trusted Shops. Questa protezione aggiuntiva comporta un minore abbandono dei carrelli';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_710142158c105c01ef807ce959cbc451'] = 'Rapporto con il cliente redditizio e a lungo termine';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_f7e15d97ad927ef705de61e787883ada'] = 'Per molti acquirenti online, il Sigillo di ApprovazioneTrusted Shops  con la Protezione acquirenti è un segno efficace di qualità per uno shopping sicuro su Internet. Gli acquirenti saltuari diventano clienti abituali.';
-$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_0f27ca369d9fee1f5e00f8277c52b014'] = 'Crea l\'ambiente giusto per utilizzare la Protezione acquirenti API TrustedShops.';
-$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_6b5690a29af233c9f94d6478850e5da5'] = 'Ambiente di prova';
-$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_98b40dff6ec06a4ef28071fc8725b474'] = 'Ambiente produzione';
-$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_2541d938b0a58946090d7abdde0d3890'] = 'invia';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_dc62561dd8d390e274487516e869fc93'] = 'Prendi il link di registrazione';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_5c93149208b3885248b960eb22e6ba49'] = 'Questa variabile è stata inviato via e-mail da TrustedShops';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_233a96df2f68dbeafaa3126edadc1ce8'] = 'identificazione interna del software del negozio a Trusted Shops';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_261720a5c993fb1cfad560d874d06254'] = 'Canale Etracker ';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_02977dc4b8561c8d7312b1931782c36b'] = 'Campagna Etracker ';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_4994a8ffeba4ac3140beb89e8d41f174'] = 'Lingua';
+$_MODULE['<{trustedshops}prestashop>tsbuyerprotection_2541d938b0a58946090d7abdde0d3890'] = 'invia';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_72ca0dcf49befb037f8d4734ee0a2a1c'] = 'Aggiungi  certificato Trusted Shops ';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_48e31908bfdcda34b0f01cad9d7077af'] = 'Nuovo certificato';
 $_MODULE['<{trustedshops}prestashop>tsbuyerprotection_75904cf055527a97739601e0f5ff7e51'] = 'Aggiungilo';
@@ -171,4 +166,3 @@ $_MODULE['<{trustedshops}prestashop>trustedshopsrating_afe906fe9448ed1b480b3eec3
 $_MODULE['<{trustedshops}prestashop>trustedshopsrating_273769f3a3d91979bfdb5ca4909c517a'] = 'Registrati per la valutazione del cliente Trusted shops';
 $_MODULE['<{trustedshops}prestashop>trustedshopsrating_2ab78702e34e81e82ca61847300b1618'] = 'Sei soddisfatto di';
 $_MODULE['<{trustedshops}prestashop>trustedshopsrating_a11109fe93f6dc4637e5b039651a4fdb'] = '? Scrivi una recensione!';
-$_MODULE['<{trustedshops}prestashop>display_products_a53a5a9f38f31d62a791717b943e02f3'] = 'EUR incl. IVA';
diff --git a/modules/trustedshops/order-confirmation-tsbp-classic.tpl b/modules/trustedshops/order-confirmation-tsbp-classic.tpl
index 5b1f3d26d..bccf57e70 100644
--- a/modules/trustedshops/order-confirmation-tsbp-classic.tpl
+++ b/modules/trustedshops/order-confirmation-tsbp-classic.tpl
@@ -23,10 +23,19 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
+<style>
+input.myButtonTricksTS
+{
+	font-size:9px !important;
+	font-weight:bolder;
+	cursor:pointer;
+	padding:3px;
+}
+</style>
 <div class="trustedshops-form" style="text-align:center;border:1px solid #ccc;padding:10px;">
 	<div style="float:left;width:72px;">
 		<form name="formSiegel" method="post" action="https://www.trustedshops.com/shop/certificate.php" target="_blank">
-			<input type="image" style="border:0;margin:10px 0 0 0;" border="0" src="{$module_dir}/img/seal.png" title="{l s='Trusted Shops Seal of Approval - Click to verify.' mod='trustedshops'}">
+			<input type="image" style="border:0;margin:10px 0 0 0;" border="0" src="{$module_dir}img/siegel.gif" title="{l s='Trusted Shops Seal of Approval - Click to verify.' mod='trustedshops'}">
 			<input name="shop_id" type="hidden" value="{$buyer_protection.shop_id}">
 		</form>
 	</div>
@@ -45,7 +54,7 @@
 	</div>
 	<div class="clear"></div>
 	<div style="text-align:right;width:100%;">
-		<input type="submit" id="btnProtect" style="display:inline-block;"name="btnProtect" class="button" value="{l s='Register for Trusted Shops Buyer Protection' mod='trustedshops'}"/>
+		<input class="myButtonTricksTS" type="submit" id="btnProtect" style="display:inline-block;" name="btnProtect" value="{l s='Register for Trusted Shops Buyer Protection' mod='trustedshops'}"/>
 	</div>
 	</form>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/twenga/config.xml b/modules/twenga/config.xml
index 46a3880a1..01a1f2ba5 100644
--- a/modules/twenga/config.xml
+++ b/modules/twenga/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>twenga</name>
 	<displayName>Twenga API</displayName>
-	<version>1.4:</version>
+	<version>1.5</version>
 	<description>Module role: export of your products on Twenga and installation of the sales tracking brought by Twenga (requires to sign up to Twenga)</description>
 	<author></author>
 	<tab>smart_shopping</tab>
diff --git a/modules/twenga/es.php b/modules/twenga/es.php
index 4cbe501ec..56658d692 100644
--- a/modules/twenga/es.php
+++ b/modules/twenga/es.php
@@ -27,7 +27,7 @@ $_MODULE['<{twenga}prestashop>twenga_1f75825a8f4b083cbed0f95efc09abfd'] = 'Por f
 $_MODULE['<{twenga}prestashop>twenga_3ea33020a5535b0157de47e53e463633'] = 'Siga este enlace para cambiar el país';
 $_MODULE['<{twenga}prestashop>twenga_5d79ec5a879860ff8546580001fe80ee'] = 'Para utilizar el webservicio de Twenga, debe activar la extensión “curl” de PHP';
 $_MODULE['<{twenga}prestashop>twenga_5f77daeb6fc30c87e051e5b5d11b034c'] = 'Se han producido errores al llamar al método \"get subscription\" con el API de Twenga';
-$_MODULE['<{twenga}prestashop>twenga_da8ac71ff9563d9a5dd0f8894c8bc0ac'] = 'Referencie sus productos en Twenga: ¡PrestaShop le regala 500 clics!';
+$_MODULE['<{twenga}prestashop>twenga_da8ac71ff9563d9a5dd0f8894c8bc0ac'] = 'Indexación de sus productos en Twenga';
 $_MODULE['<{twenga}prestashop>twenga_0ed6e223384a822859461ca6bab72256'] = '¿Tienes ya una cuenta Twenga Ready to Sell ? ';
 $_MODULE['<{twenga}prestashop>twenga_63f97ef2cb80a6cf0a8fa98453577601'] = 'Paso 1 : Copia la hashkey Twenga de tu cuenta Twenga Ready to Sell (puedes encontrarla en: herramientas>tracking>hashkey). Haz clic en \"Test de tracking\". ';
 $_MODULE['<{twenga}prestashop>twenga_5ac315e486b693637a06f490f308dc67'] = 'Paso 2 : Vuelve a esta página y copia la hashkey en el campo „hash key“. Haz clic en  Save y Activate.';
@@ -37,7 +37,7 @@ $_MODULE['<{twenga}prestashop>twenga_87645feb1c92efecd6a6946d1b498fd7'] = 'Paso
 $_MODULE['<{twenga}prestashop>twenga_b26917587d98330d93f87808fc9d7267'] = 'Suscribirse';
 $_MODULE['<{twenga}prestashop>twenga_1d79f46fad241d4984e47165ca578ee9'] = '(se han producido errores: contacte con Twenga)';
 $_MODULE['<{twenga}prestashop>twenga_195b3777fa9dcc91d27b86391e7f9a49'] = 'Paso 2 : Rellena los campos necesarios a la inscripción';
-$_MODULE['<{twenga}prestashop>twenga_767a31e960aa760c42722d2e7373b2ad'] = 'Paso 3 : Cuando recibas la hashkey Twenga por correo electrónico, vuelve a esta página y cópiala en el campo „hash key“. Haz clic en  Save e Activate. ';
+$_MODULE['<{twenga}prestashop>twenga_767a31e960aa760c42722d2e7373b2ad'] = 'Paso 3 : Cuando recibas la hashkey Twenga por correo electrónico, vuelve a esta página y cópiala en el campo „hash key“. Haz clic en Guardar y Activar.';
 $_MODULE['<{twenga}prestashop>twenga_bc88fe7063d7e7da0bf08003f21a1ad2'] = 'Aumente su tráfico - 500 clics gratis';
 $_MODULE['<{twenga}prestashop>twenga_2d82e5a3931e70d2c94b9ba6e674edbc'] = 'Haz clic aquí para ver los costes de cada categoría Twenga';
 $_MODULE['<{twenga}prestashop>twenga_f9372612b4e86b53c45d31d7ca3402bb'] = 'Twenga Precios';
diff --git a/modules/twenga/fr.php b/modules/twenga/fr.php
index e97075e5e..9fc67981a 100644
--- a/modules/twenga/fr.php
+++ b/modules/twenga/fr.php
@@ -3,7 +3,7 @@
 global $_MODULE;
 $_MODULE = array();
 $_MODULE['<{twenga}prestashop>twenga_400b0c914f01bcecf50b936e652695b2'] = 'l\'API de Twenga';
-$_MODULE['<{twenga}prestashop>twenga_64ef67f03ba236aef261078101017d57'] = 'Module rôle: l\'exportation de vos produits sur Twenga et l\'installation du suivi des ventes introduit par Twenga (nécessite de s\'inscrire pour Twenga)';
+$_MODULE['<{twenga}prestashop>twenga_64ef67f03ba236aef261078101017d57'] = 'Rôle du module : export de vos produits sur Twenga et installation du suivi des ventes apportées par Twenga (inscription sur Twenga requise)';
 $_MODULE['<{twenga}prestashop>twenga_2034864b8a4fce12f3621b7ec8912e95'] = 'Le module Twenga marche seulement dans certains pays (liste des iso codes :';
 $_MODULE['<{twenga}prestashop>twenga_bcfaccebf745acfd5e75351095a5394a'] = 'Désactiver';
 $_MODULE['<{twenga}prestashop>twenga_526d688f37a86d3c3f27d0c5016eb71d'] = 'Réinitialiser';
diff --git a/modules/twenga/it.php b/modules/twenga/it.php
index a3d570783..a065faad0 100644
--- a/modules/twenga/it.php
+++ b/modules/twenga/it.php
@@ -27,17 +27,17 @@ $_MODULE['<{twenga}prestashop>twenga_1f75825a8f4b083cbed0f95efc09abfd'] = 'Si pr
 $_MODULE['<{twenga}prestashop>twenga_3ea33020a5535b0157de47e53e463633'] = 'Segui questo link per cambiare il Paese';
 $_MODULE['<{twenga}prestashop>twenga_5d79ec5a879860ff8546580001fe80ee'] = 'Si prega di attivare l\'estensione PHP  \'curl\' per permettere l\'uso della libreria webservice Twenga';
 $_MODULE['<{twenga}prestashop>twenga_5f77daeb6fc30c87e051e5b5d11b034c'] = 'Alcuni errori si sono verificati con il Twenga API \"ottenere link di sottoscrizione\":';
-$_MODULE['<{twenga}prestashop>twenga_da8ac71ff9563d9a5dd0f8894c8bc0ac'] = 'Referenzia i tuoi prodotti su Twenga: 500 clic offerti da Prestashop!';
+$_MODULE['<{twenga}prestashop>twenga_da8ac71ff9563d9a5dd0f8894c8bc0ac'] = 'Indicizza i tuoi prodotti su Twenga';
 $_MODULE['<{twenga}prestashop>twenga_0ed6e223384a822859461ca6bab72256'] = 'Sei già inscritto a Twenga Ready to Sell ? ';
-$_MODULE['<{twenga}prestashop>twenga_63f97ef2cb80a6cf0a8fa98453577601'] = 'Step 1 : Recupera la hashkey Twenga dal tuo conto Twenga Ready to Sell (tools>tracking>hashkey). Clicca su \"Test the tracking\". ';
+$_MODULE['<{twenga}prestashop>twenga_63f97ef2cb80a6cf0a8fa98453577601'] = 'Step 1 : Recupera la hashkey Twenga dal tuo conto Twenga Ready to Sell (tools>tracking>hashkey). Clicca su \"Testare il tracking\". ';
 $_MODULE['<{twenga}prestashop>twenga_5ac315e486b693637a06f490f308dc67'] = 'Step 2 : Ritorna su questa pagina copia la hashkey nel campo „hash key“. Clicca su  Save e Activate.';
 $_MODULE['<{twenga}prestashop>twenga_f5cff2635ec9ecf0249d33a7656f61c5'] = 'Vuoi iscriverti a Twenga Ready to Sell ? ';
-$_MODULE['<{twenga}prestashop>twenga_f9c31cabc1e6928068e7394f5453e759'] = 'Come indicizzare i tuoi prodotti su Twenga.it (Da aprile 2011):';
+$_MODULE['<{twenga}prestashop>twenga_f9c31cabc1e6928068e7394f5453e759'] = 'Come indicizzare i tuoi prodotti su Twenga.it';
 $_MODULE['<{twenga}prestashop>twenga_87645feb1c92efecd6a6946d1b498fd7'] = 'Step 1 : Per iscriverti a Twenga Ready to Sell clicca su questo link';
 $_MODULE['<{twenga}prestashop>twenga_b26917587d98330d93f87808fc9d7267'] = 'Iscriviti';
 $_MODULE['<{twenga}prestashop>twenga_1d79f46fad241d4984e47165ca578ee9'] = '(Errore/i: si prega di contattare Twenga)';
 $_MODULE['<{twenga}prestashop>twenga_195b3777fa9dcc91d27b86391e7f9a49'] = 'Step 2 : Compila i campi richiesti per l’iscrizione  ';
-$_MODULE['<{twenga}prestashop>twenga_767a31e960aa760c42722d2e7373b2ad'] = 'Step 3 : Una volta ricevuta la hashkey Twenga via email, ritorna su questa pagina e copiala nel campo „hash key“. Clicca su  Save e Activate. ';
+$_MODULE['<{twenga}prestashop>twenga_767a31e960aa760c42722d2e7373b2ad'] = 'Step 3 : Una volta ricevuta la hashkey Twenga via email, ritorna su questa pagina e copiala nel campo „hash key“. Clicca su Salva e poi su Attivare';
 $_MODULE['<{twenga}prestashop>twenga_bc88fe7063d7e7da0bf08003f21a1ad2'] = 'Aumenta il tuo traffico - 500 click offerti';
 $_MODULE['<{twenga}prestashop>twenga_2d82e5a3931e70d2c94b9ba6e674edbc'] = 'Clicca qui per visonare i costi per categoria Twenga';
 $_MODULE['<{twenga}prestashop>twenga_f9372612b4e86b53c45d31d7ca3402bb'] = 'Prezzi Twenga ';
diff --git a/modules/twenga/lib/TwengaAddFeed.php b/modules/twenga/lib/TwengaAddFeed.php
new file mode 100755
index 000000000..2bc61b5c7
--- /dev/null
+++ b/modules/twenga/lib/TwengaAddFeed.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * 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 : 6 rue lacepede, 75005 PARIS
+ *  @version  Release: $Revision: 1.4 $
+ *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ *  International Registered Trademark & Property of PrestaShop SA
+ **/
+
+class TwengaFieldsAddFeed extends TwengaFields
+{
+	public function __construct()
+	{
+		if(!is_array($this->fields) && empty($this->fields))
+		{
+			$this->fields['key'] = array(32, array('is_string', 'isCleanHtml'), true);
+			$this->fields['PARTNER_AUTH_KEY'] = array(56, array('is_string', 'isCleanHtml'), true);
+			$this->fields['feed_url'] = array(255, array('is_string', 'isCleanHtml'), true);
+		}
+		parent::__construct();
+	}
+
+	public function __destruct()
+	{
+
+	}
+}
diff --git a/modules/twenga/lib/TwengaFields.php b/modules/twenga/lib/TwengaFields.php
index 56d58e6ff..44c16807e 100644
--- a/modules/twenga/lib/TwengaFields.php
+++ b/modules/twenga/lib/TwengaFields.php
@@ -162,7 +162,7 @@ abstract class TwengaFields
 	public function getField($name)
 	{
 		if (!is_array($this->fields))
-			throw new TwengaFieldsException(Tools::displayError('For get a field you have to saved some fields !'));
+			throw new TwengaFieldsException(Tools::displayError('To get a field you have to saved some fields !'));
 		if(!key_exists($name, $this->fields))
 			throw new TwengaFieldsException(Tools::displayError('The field').' <b>'.$name.'</b> '.Tools::displayError('doesn\'t exist.'));
 		return $this->fields[$name];
@@ -326,4 +326,4 @@ abstract class TwengaFields
 		return str_replace('"', '&quot;', $ret);
 	}
 }
-class TwengaFieldsException extends Exception {}
\ No newline at end of file
+class TwengaFieldsException extends Exception {}
diff --git a/modules/twenga/lib/TwengaObj.php b/modules/twenga/lib/TwengaObj.php
index 69f89fa87..3f6a0c004 100644
--- a/modules/twenga/lib/TwengaObj.php
+++ b/modules/twenga/lib/TwengaObj.php
@@ -191,6 +191,7 @@ class TwengaObj
 			self::$arr_api_url['orderExist'] = 'http://rts.twenga.com/api/Order/Exist';
 			self::$arr_api_url['orderValidate'] = 'http://rts.twenga.com/api/Order/Validate';
 			self::$arr_api_url['orderCancel'] = 'http://rts.twenga.com/api/Order/Cancel';
+			self::$arr_api_url['addFeed'] = 'https://rts.twenga.com/api/Site/AddFeed';
 			
 			if(self::PARTNER_AUTH_KEY === NULL)
 				throw new TwengaException(self::$translation_object->l('To activate the Twenga plugin, "PARTNER_AUTH_KEY" contant must be set. Default installation of Prestashop contains this value.', basename(__FILE__, '.php')));
@@ -222,7 +223,7 @@ class TwengaObj
 	 * @param array $params
 	 * @param boolean $authentication
 	 * @throws TwengaException in case of cURL error.
-	 * @return array with status code and response of the cURL reponse.
+	 * @return array with status code and response of the cURL request.
 	 */
 	private static function executeQuery($query, array $params = array(), $authentication = true)
 	{
@@ -299,10 +300,32 @@ class TwengaObj
 		} catch (Exception $e) {
 			throw new TwengaException(self::$translation_object->l($e->getMessage(),basename(__FILE__, '.php')), $e->getCode());
 		}
-			
 		return (array)$obj_xml;
 	}
-	
+
+	public function addFeed($params = array())
+	{
+		require_once realpath(self::$base_dir.'/TwengaAddFeed.php');
+		$params['key'] = self::$hashkey;
+		$params['PARTNER_AUTH_KEY'] = self::PARTNER_AUTH_KEY;
+		try {
+			self::checkParams(__FUNCTION__, $params);
+		} catch (TwengaFieldsException $e) {
+			throw $e;
+		}
+		$str_params = self::buildUrlToQuery(self::$arr_api_url[__FUNCTION__],$params);
+		try {
+			$response = self::executeQuery($str_params);
+			self::checkStatusCode($response['status_code']);
+			$obj_xml = self::parseXml($response['response']);
+		} catch (TwengaException $e) {
+			throw $e;
+		} catch (Exception $e) {
+			throw new TwengaException(self::$translation_object->l($e->getMessage(),basename(__FILE__, '.php')), $e->getCode());
+		}
+		return ((string)$obj_xml->message === 'true') ? true : false;
+	}
+
 	/**
 	 * @param array $params
 	 * @throws TwengaFieldsException
diff --git a/modules/twenga/twenga.php b/modules/twenga/twenga.php
index e78100877..4d6532a9a 100644
--- a/modules/twenga/twenga.php
+++ b/modules/twenga/twenga.php
@@ -110,7 +110,7 @@ class Twenga extends PaymentModule
 		$this->token = Tools::getValue('token');
 	 	$this->name = 'twenga';
 	 	$this->tab = 'smart_shopping';
-	 	$this->version = '1.4:';
+	 	$this->version = '1.5';
 		
 	 	parent::__construct();
 	
@@ -316,7 +316,9 @@ class Twenga extends PaymentModule
 			}
 			if(!$bool_save)
 				$this->_errors[] = $this->l('Authentication failed.')."<br />\n"
-					.$this->l('Please review the e-mail sent by Twenga after subscription. If error still occurred, contact Twenga service.');
+				.$this->l('Please review the e-mail sent by Twenga after subscription. If error still occurred, contact Twenga service.');
+			else
+				self::$obj_twenga->addFeed(array('feed_url' => $this->feed_url));
 		}
 	}
 
diff --git a/themes/prestashop/lang/de.php b/themes/prestashop/lang/de.php
index ef1a84d02..edc9b3784 100644
--- a/themes/prestashop/lang/de.php
+++ b/themes/prestashop/lang/de.php
@@ -190,7 +190,7 @@ $_LANG['history_01abfc750a0c942167651c40d088531d'] = 'Nr.';
 $_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
 $_LANG['history_27792947ed5d5da7c0d1f43327ed9dab'] = 'Details';
 $_LANG['history_332c80b1838dc515f5031e09da3b7f3f'] = 'Neu bestellen';
-$_LANG['history_5acc2ceeb883ba07cef2d02ea382f242'] = 'Sie haben noch nicht bestellt';
+$_LANG['history_5acc2ceeb883ba07cef2d02ea382f242'] = 'Sie haben noch keine Bestellungen';
 $_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Zurück zu Ihrem Konto';
 $_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Start';
 $_LANG['identity_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mein Konto';
@@ -508,7 +508,7 @@ $_LANG['product-list_ca2bf12169883f4982d8fe34b7e3c618'] = 'Reduzierter Preis!';
 $_LANG['product-list_d0fcb89c94b29d6ab2db749ff688dc7c'] = 'Web- Exklusivität!';
 $_LANG['product-list_78945de8de090e90045d299651a68a9b'] = 'Auf Lager';
 $_LANG['product-list_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Ausverkauft';
-$_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Zum Warenkorb hinzufügen';
+$_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Zum Warenkorb';
 $_LANG['product-list_4351cfebe4b61d8aa5efa1d020710005'] = 'Das Produkt ansehen';
 $_LANG['product-list_77798ad342555ffa834758a2aaa6fc11'] = 'Vergleichen';
 $_LANG['product-sort_cfab1ba8c67c7c838db98d666f02a132'] = '-';
@@ -611,10 +611,10 @@ $_LANG['shopping-cart_a40cab5994f36d4c48103a22ca082e8f'] = 'Ihr Warenkorb';
 $_LANG['shopping-cart_5f6b9be870bc784ecc15ddb5dcf7f22e'] = 'Übersicht über die Bestellung';
 $_LANG['shopping-cart_879f6b8877752685a966564d072f498f'] = 'Ihr Warenkorb ist leer.';
 $_LANG['shopping-cart_5af5f631f774a71445e3028253874394'] = 'Dieser Shop hat Ihre neue Bestellung nicht angenommen.';
-$_LANG['shopping-cart_80501a4e00716f2b94f22a465db82b51'] = 'Letztes hinzugefügtes Produkt';
-$_LANG['shopping-cart_ab88d481b4332548cd3ca2aa26fd6edc'] = 'Ihr Warenkorb enthält';
 $_LANG['shopping-cart_f5bf48aa40cad7891eb709fcf1fde128'] = 'Produkt';
 $_LANG['shopping-cart_86024cad1e83101d97359d7351051156'] = 'Produkte';
+$_LANG['shopping-cart_80501a4e00716f2b94f22a465db82b51'] = 'Letztes hinzugefügtes Produkt';
+$_LANG['shopping-cart_ab88d481b4332548cd3ca2aa26fd6edc'] = 'Ihr Warenkorb enthält';
 $_LANG['shopping-cart_deb10517653c255364175796ace3553f'] = 'Produkt';
 $_LANG['shopping-cart_b5a7adde1af5c87d7fd797b6245c2a39'] = 'Beschreibung';
 $_LANG['shopping-cart_12d3c7a4296542c62474856ec452c045'] = 'Ref.';
diff --git a/translations/de/admin.php b/translations/de/admin.php
index 5beb325d5..00c8038be 100644
--- a/translations/de/admin.php
+++ b/translations/de/admin.php
@@ -2947,7 +2947,7 @@ $_LANGADM['AdminTabcc3787ca78f445f481069a4c047f7e7a'] = 'Wählen Sie eine Sprach
 $_LANGADM['index86bbc77fd75ac02c21b84a37b260eadd'] = 'Verwaltungsfeld';
 $_LANGADM['index4236a440a662cc8253d7536e5aa17942'] = 'Abmelden';
 $_LANGADM['indexd70861cbe7f8c9a1241c39b3e7ef5ef2'] = 'Siehe Mein Shop';
-$_LANGADM['indexf84b4e2770ec98e3db2926cd49864d2f'] = 'Meine Favoriten';
+$_LANGADM['indexf84b4e2770ec98e3db2926cd49864d2f'] = 'Mein Profil';
 $_LANGADM['indexcbebc850f5f849e8956b5f8075f48f69'] = 'Alles';
 $_LANGADM['index46f22f2a56ddd091f4b2b2c35c5ca989'] = 'Katalog';
 $_LANGADM['index4b6f7d34a58ba399f077685951d06738'] = 'Kunden';