[*] 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
[-] 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
Merge pull request #716 from romainberger/typos

[*] FO : removed extra slash and point
[-] BO : Bug fix - Encoding & tips of the day
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists()
// Typo
[-] BO : Fix bug, orders states not ordered by order state name
[-] BO : Customer message twice encoded