fix translation
fix Merge remote-tracking branch 'origin/master' into mergetranslation

Conflicts:
	app/Resources/translations/icap_dropzone.fr.yml
Merge pull request #123 from InnovaLangues/mergetranslation

Mergetranslation