// Begining of Support for Advanved Stock Managment in CSV Import
[+] BO: Added support for Advanced Stock Management
[*] BO: Fixed typos
[*] BO: Auto remove product from DependsOnStock of Advanced Stock Management is disabled
[*] BO: Added id to warehouse controller
[+] BO : Added support to set A warehouse by id
[*] BO : Import will clear any warehouses allready set
[-] BO : Fixed incorrect error message in a_s_m
[+] BO : Added support for Depends On Stock
[-] BO : Added missing check if warehouse is set in csv
//ignore .bak
// .bak
// small fixes in English Email php templates
// fix attributes-color-container
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
// fixed links in new English mails
// fix scroll vertical nav
Merge pull request #892 from djfm/bootstrap

// small fixes in English Email php templates
[*] BO : download attachments directly from the list
// Fixed default selection in the stats submenu
// Fixed default stats graph engine
// Code cleaning stats modules
// search type in BO
// Add Save button to page header toolbar
// dashboard date range picker wip
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap