[*] BO : navigation + toolbar
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	admin-dev/themes/default/template/header.tpl