// update some css&tpl bugs
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// Change order button language