[*] MO: Referral program: display currency in account page next to the voucher value
Update admin.css

force size for module logo to keep a good design structure
PNM-1241 Issue with backbutton

This will solve the issue with url indexing not working for all languages.
[-] BO : FixBug Missing tpl dir in default layout
[-] BO : FixBug #PSCFV-10038 escaped quote in address fields
[-] BO : FixBug #PSCFV-10037 for to choose a state when state is enabled for country
Merge pull request #497 from romainberger/development

[*] MO: Referral program: display currency in account page next to the voucher value
[-] BO : FixBug smarty email variable override by blockcontact
Merge pull request #507 from jeckyl/patch-3

[*] BO : Fix size for modules logo AdminModulesPositions
[-] BO : FixBug message charset problem in mail
[-] BO : Check if function mb_encode_mimeheader exist in case some user uninstall it
[-] MO : CarrierCompare FixBug #PSCFV-9975 Ajax SSL error
Merge pull request #563 from Prestaworks/patch-12

[-] MO : Fix bug #PNM-1241 with 1.4 translations, url indexing not working for all languages.
[-] MO : blockcategories FixBug html tags in categories link title
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] BO: correct link in Block Discover.
Merge pull request #639 from PrestaEdit/patch-49

[-] BO: correct link in Block Discover.
[-] MO : sendtofriend FixBug Form error
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] FO : FixBug #PSCFV-10026 SSL error on ajax action