Merge branch 'hotfix/fix-ds'
Adds French language to the language drop down in the
administration area
Merge branch 'hotfix/french-language' into develop