// more sensible behaviour of smarty l tags argument
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