[-] FO : FixBug #PSCSX-246 - Default active tab
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	themes/default-bootstrap/modules/blocknewproducts/tab.tpl