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

controllers/admin/AdminStatusesController.php

@@ -136,6 +136,7 @@ class AdminStatusesControllerCore extends AdminController
 	{
 		$this->table = 'order_return_state';
 		$this->_defaultOrderBy = $this->identifier = 'id_order_return_state';
+		$this->list_id = 'order_return_state';
 		$this->deleted = false;
 		$this->_orderBy = null;
 

js/admin.js

@@ -481,7 +481,7 @@ function askFeatureName(selected, selector)
 {
 	var elem;
 
-	if (selected.value == 'feature')
+	if (selected.value == 'features')
 	{
 		$('#features_' + selector).show();
 		$('#feature_name_' + selector).attr('name', selected.name);

modules/blocknewproducts/blocknewproducts.php

@@ -134,6 +134,11 @@ class BlockNewProducts extends Module
 	{
 		return $this->hookRightColumn($params);
 	}
+	
+	public function hookHome($params)
+	{
+		return $this->hookRightColumn($params);
+	}
 
 	public function hookHeader($params)
 	{