?
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjetInfo/ProjetInfo.v12.suo