// add compass config.rb for theme default-bootstrap
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap