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

admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl

@@ -103,8 +103,6 @@
 				<i class="icon-edit"></i> {l s='Edit'}
 			</a>
 		</div>
-
-		
 		<div class="panel">
 			<div class="panel-heading">
 				<i class="icon-file"></i> {l s='Orders'} <span class="badge">{count($orders)}</span>
@@ -542,6 +540,5 @@
 			{/if}
 		</div>
 	</div>
-
 </div>
-{/block}
+{/block}