corr
Merge remote-tracking branch 'origin/master'

Conflicts:
	poster/synthese-gr25.tex