Merge branch 'release' of github.com:PrestaShop/PrestaShop into release
// Remove author detail

Conflicts:
	admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
[-] BO : Fix error message on same variation
// Display error if theme exists
// Display error if theme exists
[-] BO : Fix bug #PSCSX-2354, divider in option list
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
[*] BO : Prevent nyll bytes in upload name
// Code cleaning
[*] BO : Fix _PS_CACHING_SYSTEM_ selection
// bad commit https://github.com/PrestaShop/PrestaShop/commit/c59f3f2383a8dfa731ef2d5b1ba5f9435169cee3
// typo
// Added a second secure mode for modules
[*] BO : UI fixes for addon's login, payments, themes
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
// Add purifyhtml
// Add purifyhtml

Conflicts:
	install-dev/upgrade/sql/1.6.0.7.sql
// forgot
// forgot
[-] BO : fixed contextual help language