// more sensible behaviour of smarty l tags argument
// Fix module position icon
//small fix
Merge branch 'smarty_translations_tags' of https://github.com/djfm/PrestaShop into djfm-smarty_translations_tags

Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
//desable AdminModuleController when module is desable
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] CORE : Fix bug #PSCSX-939, cookie currency can be deleted
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] BO : FixBug #PSCSX-948 - Fix new supply orders template bug
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge pull request #1480 from xBorderie/1.6

[*] BO : wording consistency for "Zip/postal code".
[*] BO : specific price fix - PSCSX-837
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6