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

Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js

controllers/admin/AdminStockInstantStateController.php

@@ -67,7 +67,7 @@ class AdminStockInstantStateControllerCore extends AdminController
 			),
 			'valuation' => array(
 				'title' => $this->l('Valuation'),
-				'orderby' => true,
+				'orderby' => false,
 				'search' => false,
 				'type' => 'price',
 				'currency' => true,
@@ -88,7 +88,7 @@ class AdminStockInstantStateControllerCore extends AdminController
 			'real_quantity' => array(
 				'title' => $this->l('Real quantity'),
 				'width' => 80,
-				'orderby' => true,
+				'orderby' => false,
 				'search' => false,
 				'hint' => $this->l('Physical quantity (usable) - Client orders + Supply Orders'),
 			),