// small fix
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	modules/themeconfigurator/themeconfigurator.php