Merge branch 'hotfix/french-language'
Replaces DS by / it was causing windows servers to have
a back slash on urls
Merge branch 'hotfix/directory-separator' into develop