Service JSON FOnctionnel
Service JSON opérationnel
Merge branch 'master' of https://github.com/flotteur/projet_synthese

Conflicts:
	.gitignore
	Data_synthese/ProjetSynthese.sln
	Data_synthese/WCF_Synthese/WCF_Synthese.csproj