//group shop and shop add button are back
tMerge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6