// added an option not to override the local localization pack when installing a localization pack
Update productcomments.php

This little addition fix the problem for enlight the stars in the hookproductTab whe you disable or make an exception of the hookproductOutOfStock with the product file.
Merge pull request #945 from Javsmile/patch-2

// Update productcomments.php
Merge pull request #926 from djfm/loc_ui

//Localization
Merge pull request #992 from djfm/development

// fixed typo in Russian installer
[-] 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
// Changelog 1.5.6.1
"---<br />" string is now removed correctly from the end of customization data text
"---<br />" string is now removed correctly from the end of customization data text
[-] FO : Fix #PSCFV-11069 remove unused file
[-] FO : Fix bug #PSCFV-11052 no carrier fess whne tax display to false
Adding a position order by clause.

Adding a position order by clause. This way you can manage how the featured products will display on home page. You can manage the order from the PrestaShop backend, and thus you have full control on the display in the frontend.
Merge pull request #1003 from priyank/patch-1

[-] FO : Homefeatured adding a position order by clause.
Merge pull request #1000 from studiokiwik/sk-ps15x-011

"---<br />" string is now removed correctly from the end of customization data text
[-] FO : Fixed bug #PSCFV-11076
[-] BO : Remove warning with open_basdir on module list
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] IN :  bad reset on vars in migrate_orders
// updated Italian VAT rate