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

# By Sarah Lorenzini (1) and sLorenzini (1)
# Via Sarah Lorenzini
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  // update shipping tab
  // update shipping tab

Conflicts:
	admin-dev/themes/default/template/helpers/options/options.tpl

controllers/admin/AdminCarriersController.php

@@ -30,6 +30,7 @@ class AdminCarriersControllerCore extends AdminController
 
 	public function __construct()
 	{
+		$this->bootstrap = true;
 		$this->table = 'carrier';
 		$this->className = 'Carrier';
 		$this->lang = false;

controllers/admin/AdminRangePriceController.php

@@ -28,6 +28,7 @@ class AdminRangePriceControllerCore extends AdminController
 {
 	public function __construct()
 	{
+		$this->bootstrap = true;
 	 	$this->table = 'range_price';
 	 	$this->className = 'RangePrice';
 	 	$this->lang = false;
@@ -81,7 +82,6 @@ class AdminRangePriceControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('From:'),
 					'name' => 'delimiter1',
-					'size' => 5,
 					'required' => true,
 					'suffix' => $currency->getSign('right').' '.$this->l('(Tax Incl.)'),
 					'desc' => $this->l('Start range (included)'),
@@ -91,7 +91,6 @@ class AdminRangePriceControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('To:'),
 					'name' => 'delimiter2',
-					'size' => 5,
 					'required' => true,
 					'suffix' => $currency->getSign('right').' '.$this->l('(Tax Incl.)'),
 					'desc' => $this->l('End range (excluded)'),

controllers/admin/AdminRangeWeightController.php

@@ -28,6 +28,7 @@ class AdminRangeWeightControllerCore extends AdminController
 {
 	public function __construct()
 	{
+		$this->bootstrap = true;
 	 	$this->table = 'range_weight';
 	 	$this->className = 'RangeWeight';
 	 	$this->lang = false;

controllers/admin/AdminShippingController.php

@@ -30,6 +30,7 @@ class AdminShippingControllerCore extends AdminController
 
 	public function __construct()
 	{
+		$this->bootstrap = true;
 		parent::__construct();
 	 	$this->table = 'delivery';