Merge branch 'master' into dev
Merge branch 'dev' of https://github.com/PrestaShop/blocktopmenu into dev
[*] MO : blocktopmenu - better multishop details display