Merge branch 'gh-pages'
Merge branch 'gh-pages' into develop
changing french l10n
Merge branch 'develop'
Merge branch 'master' into gh-pages