Update French language
Merge commit '840d96c08e3d3c9c94fb77f2a448b691710def59'

Conflicts:
	platform/core/common/language/french/ui_lang.php
Merge commit 'f8a6c5e680bce97e7270fda0928403e897c06525'
Merge commit 'f8a6c5e680bce97e7270fda0928403e897c06525' into develop
Merge commit '205f67beb91a90e8b74fd9fd64d17c48b5c18cf7'
Merge commit '205f67beb91a90e8b74fd9fd64d17c48b5c18cf7' into develop
Merge commit 'a4ea37b2de889b317c43a9e71a01edcada3717ef'
Merge commit 'a4ea37b2de889b317c43a9e71a01edcada3717ef' into develop
Merge commit 'efe7d7cfff0337e29ed67d2874b383b93a549853' into develop
Merge commit 'efe7d7cfff0337e29ed67d2874b383b93a549853'
Merge branch 'master' of https://github.com/ivantcholakov/starter-public-edition-4
Merge branch 'master' into develop
Merge commit '57d65de511eed28ada40d43331d5b05b500a54cc' into develop
Update French Language
Fix Update French Language
Merge pull request #22 from dev-ggallon/develop

Update French language