Branche
Maitre
Merge branch 'dialogue'

Conflicts:
	nooooooo