//fixed bug #PSCSX-1598
// css fix
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	controllers/admin/AdminCarriersController.php
[-] BO : Fix bug #PSCSX-1648, missing $has_bulk_actions in header