[-] CORE : Fix bug #PSCSX-2307, bad language_code in ps_lang < 1.5.6.1
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Conflicts:
	classes/Language.php