// 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
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// reorganize some css and stuff on backward compatibility
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap