WIP : Carrier Admin sql data migration
Merge pull request #689 from grandoc/develop

english language standardization
Merge pull request #690 from frederic34/develop

WIP : Carrier Admin sql data migration
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
fix error commit