//dashboard module set configuration & hook on upgrade
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge pull request #1368 from xBorderie/1.6

[*] BO : String consistency.
[-] BO : FixBug #PSCFV-11448 Attributes Impact not duplicated
[-] MO : fixed dashtrends conversion rate comparison #PSCSX-583
// Cast fix
// Fix Float
// Quickfix module page name in BO
Update Theme.php

//'._DB_PREFIX_.' missing lines 182 and 199
// Correct thumb image path for filemanager
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// Add normalize dir to tools
// Quick fix meta title
Merge pull request #1369 from vinzter/patch-1

Update Theme.php
[*] BO : some changes into design
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// theme without preview.jpg will not be displayed in the list of themes
[-] BO : FixBug #PSCSX-642 - Selected carriers not added
// revert historical cast to string for 1.5 template