// autoupgrade: wording.
Merge pull request #22 from xBorderie/patch-1

// autoupgrade: wording.
// Added Readme.md
// Fix PSCFV-12080: also look for translations in the translations folder
Merge pull request #23 from djfm/dev

// Fix PSCFV-12080: also look for translations in the translations folde...
// bad encoding
[-] MO : Fix PSCSX-2900 error while deleting
//Version update
Merge branch 'dev'

Conflicts:
	autoupgrade.php
	config.xml