texte in EN
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/messages.en