language code changes from French to English
Merge branch 'code_reorganization' into develop