//ignore .bak
// .bak
//remove unnecessary addCSS (fancybox)
// theme configurator
// themeconfigurator
// no need mobile version with responsive :)
Merge pull request #923 from PrestaEdit/1.6.x-fancybox

//remove unnecessary addCSS (fancybox)
Merge pull request #929 from djfm/bootstrap

// updated English emails: now responsive
//typo
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// dashboard
// Fix Combinations list actions button problem
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
improved  scss variables
// Fix missing page header in combinations generator
// Live is deprecated in jquery 1.9
// Fix bug JQuery on handler
Merge pull request #936 from TMMeilleur/bootstrap

// improved  scss variables
// English emails