[*] BO :  Orders - fix PSCSX-780
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[*] BO :  Working on Nav
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6