Mise en place des services
Merge remote-tracking branch 'origin/master'

Conflicts:
	C#/BProject/BProject.v12.suo
	C#/BProject/Services/Services.csproj