[*] BO: updating labels and descriptions for Import form.tpl
// hint > desc, text too long to fit in hint tooltip
// Forgot one string change.
[-] FO : Fix css bug #PSCSX-1427
// products/informations.tpl: typo.
// small fix
[*] BO : Bug #PSCSX-1763, Display bought label in module list
// CSS update
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	themes/default-bootstrap/css/global.css
[*] BO : clearer labels for request_sql
// rewording to SQL query
// CSS update
// rewording to SQL query
// classes/Mail.php: typo.
Merge pull request #1668 from xBorderie/patch-12

// classes/Mail.php: typo.
Merge pull request #1667 from xBorderie/patch-11

[*] BO : better labels for SQL Manager.
Merge pull request #1666 from xBorderie/patch-5

// products/informations.tpl: typo.
Merge pull request #1664 from xBorderie/patch-1

[*] BO: updating labels and descriptions for Import form.tpl
[-] FO : Contact form Exception with ip2long
[-] BO : fix a display when updating a module with a file upgrade