Merge pull request #1985 from AlexEven/release

// classes/Product.php: wording
// notice
// QuickLinks
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// QuickLinks
// notice
[-] BO : Fixed Friendly URL switch  + mod rewrite warning
// added displayOverrideTemplate hook on the installer, it must not use live_edit
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// added displayOverrideTemplate hook on the installer, it must not use live_edit
// fix php compatibility
// fix php compatibility
[+] BO : Added plugin Anchor to Tiny MCE
// GuestTrackingController.php: wording.
Merge pull request #1987 from xBorderie/patch-1

// GuestTrackingController.php: wording.
Merge pull request #1955 from silici0/1.6

[-] BO : Fix Bug #PSCSX-2660 Test for permission on bulk_delete
[-] BO : Fix Bug #PSCSX-2660 Test for permission on bulk_delete
// AdminAddressesController.php: wording
Merge pull request #1988 from AlexEven/release

// AdminAddressesController.php: wording
// Fix quick access undefined name