// Fix products controller title
// 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