Merge remote-tracking branch 'origin/master'

Conflicts:
	GestionIndicielle.v12.suo