// 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
// update code on footer and header
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge pull request #1098 from djfm/1.6

// typo in default theme blockcart.tpl
// data-id-product instead of using rel tag
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	themes/default-bootstrap/products-comparison.tpl
// fixed undefined variable in blocktopmenu
[*] BO : changed dashgoals system
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge pull request #1099 from djfm/blocktopmenu

// fixed undefined variable in blocktopmenu
// data-id-product instead of using rel tag
// update product-list itemproperty
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] BO : fixed top right link with the "open in a new tab" button
[*] CORE: original search_query assign to .tpl

Avoid problems with special characters for eg. in polish language like ąźćłó etc.
// update indent code
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6