// fix admin edit countries
// small changes on orders view
// small changes on orders view
//Fix save and stay combinations problem
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// small fix
// Add sublime project file to gitignore
// Check if exist children opt. in employees
// Products combinations form bootstraping
// Dashgoals :)
// Add units to goals configuration
// Fix Stats datepicker
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
[+] FO : New Responsive, Bootstrap template
// Started to adapt the install to the new template
// English
Merge pull request #877 from djfm/bootstrap

// English
// update mail templates
merge
// update css mail template