[-] BO : FixBug #PNM-1594 - Double selected option value
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Conflicts:
	admin-dev/themes/default/template/helpers/list/list_header.tpl