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

Conflicts:
	controllers/admin/AdminCategoriesController.php

controllers/admin/AdminManufacturersController.php

@@ -287,6 +287,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('Name:'),
 					'name' => 'name',
+					'col' => 4,
 					'required' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				),
@@ -298,6 +299,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'cols' => 60,
 					'rows' => 10,
 					'autoload_rte' => 'rte', //Enable TinyMCE editor for short description
+					'col' => 6,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				),
 				array(
@@ -307,6 +309,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'lang' => true,
 					'cols' => 60,
 					'rows' => 10,
+					'col' => 6,
 					'autoload_rte' => 'rte', //Enable TinyMCE editor for description
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				),
@@ -317,6 +320,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'image' => $image_url ? $image_url : false,
 					'size' => $image_size,
 					'display_image' => true,
+					'col' => 6,
 					'hint' => $this->l('Upload a manufacturer logo from your computer.')
 				),
 				array(
@@ -324,6 +328,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'label' => $this->l('Meta title:'),
 					'name' => 'meta_title',
 					'lang' => true,
+					'col' => 4,
 					'hint' => $this->l('Forbidden characters:').' <>;=#{}'
 				),
 				array(
@@ -331,6 +336,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'label' => $this->l('Meta description:'),
 					'name' => 'meta_description',
 					'lang' => true,
+					'col' => 6,
 					'hint' => $this->l('Forbidden characters:').' <>;=#{}'
 				),
 				array(
@@ -338,6 +344,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'label' => $this->l('Meta keywords:'),
 					'name' => 'meta_keywords',
 					'lang' => true,
+					'col' => 6,
 					'hint' => array(
 						$this->l('Forbidden characters:').' <>;=#{}',
 						$this->l('To add "tags," click inside the field, write something, and then press "Enter."')
@@ -435,6 +442,7 @@ class AdminManufacturersControllerCore extends AdminController
 				'type' => 'text',
 				'label' => $this->l('Manufacturer:'),
 				'name' => 'name',
+				'col' => 4,
 				'disabled' => true,
 			);
 
@@ -459,6 +467,7 @@ class AdminManufacturersControllerCore extends AdminController
 			'label' => $this->l('Last name:'),
 			'name' => 'lastname',
 			'required' => true,
+			'col' => 4,
 			'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:'
 		);
 		$form['input'][] = array(
@@ -466,24 +475,28 @@ class AdminManufacturersControllerCore extends AdminController
 			'label' => $this->l('First name:'),
 			'name' => 'firstname',
 			'required' => true,
+			'col' => 4,
 			'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:'
 		);
 		$form['input'][] = array(
 			'type' => 'text',
 			'label' => $this->l('Address:'),
 			'name' => 'address1',
+			'col' => 6,
 			'required' => true,
 		);
 		$form['input'][] = array(
 			'type' => 'text',
 			'label' => $this->l('Address (2):'),
 			'name' => 'address2',
+			'col' => 6,
 			'required' => false,
 		);
 		$form['input'][] = array(
 			'type' => 'text',
 			'label' => $this->l('Zip Code/Postal Code'),
 			'name' => 'postcode',
+			'col' => 2,
 			'required' => true,
 			'required' => false,
 		);
@@ -491,6 +504,7 @@ class AdminManufacturersControllerCore extends AdminController
 			'type' => 'text',
 			'label' => $this->l('City:'),
 			'name' => 'city',
+			'col' => 4,
 			'required' => true,
 		);
 		$form['input'][] = array(
@@ -499,6 +513,7 @@ class AdminManufacturersControllerCore extends AdminController
 			'name' => 'id_country',
 			'required' => false,
 			'default_value' => (int)$this->context->country->id,
+			'col' => 4,
 			'options' => array(
 				'query' => Country::getCountries($this->context->language->id),
 				'id' => 'id_country',
@@ -510,6 +525,7 @@ class AdminManufacturersControllerCore extends AdminController
 			'label' => $this->l('State:'),
 			'name' => 'id_state',
 			'required' => false,
+			'col' => 4,
 			'options' => array(
 				'query' => array(),
 				'id' => 'id_state',
@@ -520,12 +536,14 @@ class AdminManufacturersControllerCore extends AdminController
 			'type' => 'text',
 			'label' => $this->l('Home phone:'),
 			'name' => 'phone',
+			'col' => 4,
 			'required' => false,
 		);
 		$form['input'][] = array(
 			'type' => 'text',
 			'label' => $this->l('Mobile phone:'),
 			'name' => 'phone_mobile',
+			'col' => 4,
 			'required' => false,
 		);
 		$form['input'][] = array(
@@ -535,7 +553,8 @@ class AdminManufacturersControllerCore extends AdminController
 			'required' => false,
 			'hint' => $this->l('Forbidden characters:').' <>;=#{}',
 			'rows' => 2,
-			'cols' => 10
+			'cols' => 10,
+			'col' => 6,
 		);
 		$form['submit'] = array(
 			'title' => $this->l('Save   '),