Merge pull request #1985 from AlexEven/release

// classes/Product.php: wording
// added displayOverrideTemplate hook on the installer, it must not use live_edit
// fix php compatibility
// GuestTrackingController.php: wording.
Merge pull request #1987 from xBorderie/patch-1

// GuestTrackingController.php: wording.
Merge pull request #1988 from AlexEven/release

// AdminAddressesController.php: wording
// w3c
// fix pagination
Merge pull request #1989 from AlexEven/release

// AdminModulesController.php: wording - PHP error message update
// Tax display update
// Display new tax rule form if collection is empty
// Add default price display method
// Small fix
// w3c

Conflicts:

	controllers/admin/AdminShopUrlController.php
// Add change event to country in tax rule
// fix smarty path problem on Smarty_Internal_CacheResource_File::clear()
// Fix manufacturer address export
Merge branch 'release' of ssh://github.com/PrestaShop/PrestaShop into release
[-] FO : Bug #PSCSX-2519, Display thumbnail slider
// update