// refacto product pack
[*] BO : Product Pack refacto
[+] BO : Product Pack Refacto
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into bo-product

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
	admin-dev/themes/default/css/admin-theme_rtl.css
	admin-dev/themes/default/js/admin-theme.js
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/pack.tpl
[*] BO : Product Pack Refacto - fixes/updates
[+] BO : contextual help
[-] BO : contextual help toc fix
// help feedback WIP
// help + login WIP
//fixed bug #PSCSX-2087
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
//fixed bug #PSCSX-2146
// index

Conflicts:
	install-dev/upgrade/sql/1.6.0.7.sql
// small fix
Merge branch 'bo-product' of ssh://github.com/PrestaShop/PrestaShop into bo-product

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
	admin-dev/themes/default/css/admin-theme_rtl.css
	admin-dev/themes/default/sass/admin-theme.sass
	admin-dev/themes/default/template/controllers/products/prices.tpl
// Show correct input
Merge branch 'bo-product' into release

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
	admin-dev/themes/default/css/admin-theme_rtl.css
	admin-dev/themes/default/js/admin-theme.js
	admin-dev/themes/default/template/header.tpl
Merge branch 'release' of ssh://github.com/PrestaShop/PrestaShop into release
// addons links
Merge pull request #1855 from djfm/release

// updated installer translations