// Uploader helper part 2
// Add new uploader helper to blockcategories
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// Uploader helper small fix
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap