Consultation
Merge remote-tracking branch 'origin/Nicolas' into Nicolas

Conflicts:
	SimWormsProject/SimWorms.sdf
	SimWormsProject/SimWorms.v12.suo