Renaming du projet
Merge remote-tracking branch 'origin/master'

Conflicts:
	Combaxe - Solution/Combaxe.suo