// backward compatibility remix WIP
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

Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// update cms controller title
[-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos
fixed banners style
// Add language iso code to language select
// Csv import fix hide checkbox
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
[-] FO : Fixed meta title entities #PSCFV-10312
// reorganize some css and stuff on backward compatibility
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Merge pull request #1002 from TMMeilleur/bootstrap

//fixed banners style
[*] BO : Added combination ean13 in the backend search #PSCFV-10436
// Fixed slider image
// more image fixes
[-] FO : fixed tax rules cache