[*] MO : MailAlerts : multishop/multilang full compatibility
Customers will receive alerts based on the real context of the moment they subscribed to the alert (sho, theme & language)

SQL update table : `ps_mailalert_customer_oos`
=========================================

ALTER TABLE `ps_mailalert_customer_oos`
ADD `id_lang` INT( 10 ) UNSIGNED NOT NULL ,
DROP PRIMARY KEY ,
ADD PRIMARY KEY ( `id_customer` , `customer_email` , `id_product` , `id_product_attribute` , `id_shop` ) ;
[*] MO : MailAlerts : Add SQL update script for v2.5
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
[-] BO: Fix preview url with multishop
// oups
// Updated README.md
[-] BO: Fix out of stock creation with multishop and stock sharing
[-] BO : Small changes when creating vouchers in back office orders
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] WS: Fix entities retrieve for some cases
[-] Core: Set a remote addr with php-cli #PSCFV-10372
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] MO : Fixed a bug when displaying textures

Corrections links texture image in the blocklayered
Merge pull request #715 from Prestaspirit/patch-6

[-] MO : Blocklayered Fixed a bug when displaying textures
Merge pull request #709 from AgenceNetDesign/development

[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop

Conflicts:
	modules/mailalerts/mailalerts.php
[-] BO : Do not copy link_rewrite from title if cms already has one
[-] FO : 301 Redirect /iso_lang to /iso_lang/ url
[*] FO : removed extra slash and point