diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 781581eca..02f8a238f 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -207,8 +207,8 @@ class AdminTranslationsControllerCore extends AdminController
 		$packs_to_update = array();
 		$token = Tools::getAdminToken('AdminLanguages'.(int)Tab::getIdFromClassName('AdminLanguages').(int)$this->context->employee->id);
 		$file_name = $this->link_lang_pack.'?version='._PS_VERSION_;
-		$array_stream_context = array('http' => array('method' => 'GET', 'timeout' => 5));
-		if ($lang_packs = Tools::file_get_contents($file_name, false, @stream_context_create($array_stream_context)))
+		$array_stream_context = @stream_context_create(array('http' => array('method' => 'GET', 'timeout' => 8)));
+		if ($lang_packs = Tools::file_get_contents($file_name, false, $array_stream_context))
 			// Notice : for php < 5.2 compatibility, Tools::jsonDecode. The second parameter to true will set us
 			if ($lang_packs != '' && $lang_packs = Tools::jsonDecode($lang_packs, true))
 				foreach ($lang_packs as $key => $lang_pack)
@@ -768,7 +768,8 @@ class AdminTranslationsControllerCore extends AdminController
 		$arr_import_lang = explode('|', Tools::getValue('params_import_language')); /* 0 = Language ISO code, 1 = PS version */
 		if (Validate::isLangIsoCode($arr_import_lang[0]))
 		{
-			$content = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/gzip/'.$arr_import_lang[1].'/'.Tools::strtolower($arr_import_lang[0]).'.gzip');
+			$array_stream_context = @stream_context_create(array('http' => array('method' => 'GET', 'timeout' => 10)));
+			$content = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/gzip/'.$arr_import_lang[1].'/'.Tools::strtolower($arr_import_lang[0]).'.gzip', false, $array_stream_context);
 			if ($content)
 			{
 				$file = _PS_TRANSLATIONS_DIR_.$arr_import_lang[0].'.gzip';
diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index b077f8b24..3b45452c8 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -212,7 +212,7 @@ return array(
 		'Contact us' => 'Свяжитесь с нами',
 		'PrestaShop Installation Assistant' => 'Помощник установки PrestaShop',
 		'Installation Assistant' => 'Помощник установки',
-		'License Agreements' => 'Лицензионное соглшение',
+		'License Agreements' => 'Лицензионное соглашение',
 		'Print my login information' => 'Распечатать информацию о моем аккаунте',
 		'To use PrestaShop, you must <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">create a database</a> to collect all of your store\'s data-related activities.' => 'Для использования PrestaShop, Вам следует <a href="http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Creatingadatabaseforyourshop" target="_blank">создать базу данных </a>, чтобы сгруппировать информацию Вашего магазина.',
 		'Please complete the fields below in order for PrestaShop to connect to your database. ' => 'Заполните поля ниже, чтобы  PrestaShop смог установить соединение с Вашей с базой данных.',
diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php
index 11043100d..a2eb1beb4 100644
--- a/modules/dashactivity/dashactivity.php
+++ b/modules/dashactivity/dashactivity.php
@@ -392,14 +392,14 @@ class Dashactivity extends Module
 		$fields_form['form']['input'][] = array(
 				'label' => $this->l('Cart abandoned (min)'),
 				'desc' => $this->l('Default time range (min) to consider a Shopping cart as abandoned (default 24hrs)'),
-				'name' => 'DASHACTIVITY_CART_ABANDONED',
+				'name' => 'DASHACTIVITY_CART_ABANDONED_MIN',
 				'type' => 'text',
 				'suffix' => $this->l('hrs'),
 				);
 		$fields_form['form']['input'][] = array(
 				'label' => $this->l('Cart abandoned (max)'),
 				'desc' => $this->l('Default time range (max) to consider a Shopping cart as abandoned (default 48hrs)'),
-				'name' => 'DASHACTIVITY_CART_ABANDONED',
+				'name' => 'DASHACTIVITY_CART_ABANDONED_MAX',
 				'type' => 'text',
 				'suffix' => $this->l('hrs'),
 				);
diff --git a/modules/themeconfigurator/themeconfigurator.php b/modules/themeconfigurator/themeconfigurator.php
index af8737bd8..cd7231ed9 100644
--- a/modules/themeconfigurator/themeconfigurator.php
+++ b/modules/themeconfigurator/themeconfigurator.php
@@ -344,7 +344,7 @@ class ThemeConfigurator extends Module
                         Configuration::updateValue('PS_QUICK_VIEW', (int)Tools::getValue('quick_view'));
                         foreach($this->getConfigurableModules() as $module)
                         {
-                                if (!isset($module['is_module']) || !$module['is_module'] || !Validate::isModuleName($module['name']))
+                                if (!isset($module['is_module']) || !$module['is_module'] || !Validate::isModuleName($module['name']) || !Tools::isSubmit($module['name']))
                                         continue;
 
                                 $module_instance = Module::getInstanceByName($module['name']);
@@ -569,37 +569,37 @@ class ThemeConfigurator extends Module
                         array(
                                 'label' => $this->l('Display the reinsurance block'),
                                 'name' => 'blockreinsurance',
-                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockreinsurance')) && $module->active),
+                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockreinsurance')) && $module->isEnabledForShopContext()),
                                 'is_module' => true,
                         ),
                         array(
                                 'label' => $this->l('Display the social following links'),
                                 'name' => 'blocksocial',
-                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blocksocial')) && $module->active),
+                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blocksocial')) && $module->isEnabledForShopContext()),
                                 'is_module' => true,
                         ),
                         array(
                                 'label' => $this->l('Display contact information'),
                                 'name' => 'blockcontactinfos',
-                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockcontactinfos')) && $module->active),
+                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockcontactinfos')) && $module->isEnabledForShopContext()),
                                 'is_module' => true,
                         ),
                         array(
                                 'label' => $this->l('Display social buttons on the products page'),
                                 'name' => 'addsharethis',
-                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('addsharethis')) && $module->active),
+                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('addsharethis')) && $module->isEnabledForShopContext()),
                                 'is_module' => true,
                         ),
                         array(
                                 'label' => $this->l('Display facebook block on the home page'),
                                 'name' => 'blockfacebook',
-                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockfacebook')) && $module->active),
+                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockfacebook')) && $module->isEnabledForShopContext()),
                                 'is_module' => true,
                         ),
                         array(
                                 'label' => $this->l('Customer cms information block'),
                                 'name' => 'blockcmsinfo',
-                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockcmsinfo')) && $module->active),
+                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockcmsinfo')) && $module->isEnabledForShopContext()),
                                 'is_module' => true,
                         ),
                         array(
@@ -610,13 +610,13 @@ class ThemeConfigurator extends Module
                         array(
                                 'label' => $this->l('Enable top banner'),
                                 'name' => 'blockbanner',
-                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockbanner')) && $module->active),
+                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('blockbanner')) && $module->isEnabledForShopContext()),
                                 'is_module' => true,
                         ),
                         array(
                                 'label' => $this->l('Enable product payment logos'),
                                 'name' => 'productpaymentlogos',
-                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('productpaymentlogos')) && $module->active),
+                                'value' => (int)(Validate::isLoadedObject($module = Module::getInstanceByName('productpaymentlogos')) && $module->isEnabledForShopContext()),
                                 'is_module' => true,
                         )
                 );