// backward compatibility remix WIP
Removed unused local variable, tab added, phpdoc tags fixed
[*] FO : Removed unused local variable, phpdoc return tag added
// Fix products controller title
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
// Installer optimization
// Added missing configuration vars in the installer
// Fix small error
// Missing isset on cols and rows
// Add live configurator toolbox - Part 1
// Adding update button on to page header toolbar on module
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	modules/themeconfigurator/themeconfigurator.php
fixed add to wishlist/compare buttons and added product review
[+] Installer : new demo products (part 1)
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// Live configurator toolbox part 2
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Merge pull request #991 from TMMeilleur/bootstrap

// fixed add to wishlist/compare buttons and added product review