translation
Merge branch 'master' of https://github.com/acemtp/website

Conflicts:
	i18n/fr.i18n.json