l6.1 dev

dev
Merge remote-tracking branch 'origin/dev'

Conflicts:
	Nouveau document texte.txt