Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

admin-dev/themes/default/template/controllers/products/features.tpl

@@ -113,6 +113,6 @@
 </div>
 {/if}
 <script type="text/javascript">
-	hideOtherLanguage({$default_language});
+	hideOtherLanguage(default_language);
 	$(".textarea-autosize").autosize();
 </script>

admin-dev/themes/default/template/header.tpl

@@ -71,6 +71,7 @@
 		var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}';
 		var currentIndex = '{$currentIndex|@addcslashes:'\''}';
 		var choose_language_translate = '{l s='Choose language' js=1}';
+		var default_language = '{$default_language|addslashes}';
 	</script>
 {/if}
 {if isset($css_files)}