[-] FO : FixBug Categories description
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Update ajax-wishlist.js

innerHtml can not execute javascript from "data". If someone modify php files returned from jquery function and includes a script, it's not executed.
// do not use sprintf when it is useless
Merge pull request #961 from joseantgv/patch-4

[-] MO : Whishlist, innerhtml in html jquery
[-] FO : Customized meesage with carriage return follow up #962
Merge pull request #963 from djfm/sprintf

// do not use sprintf in installer when it is useless
[*] FO : Redirect to address.tpl when !Address::isCountryActiveById
[-] FO : #PSCFV-10978 firstname displayed instead of lastname in invoice address
// small fix
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'iso' code, allows to distinguish between chinese variants etc.
Merge pull request #965 from djfm/IETF

[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'is...
[*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956
// typo
[-] FO : Fixed errors when calculating most selled products from footer link
// small fix
Merge remote-tracking branch 'origin/development' into development
[+] CORE : Fixed cache_id