Modif pour le services web
Merge branch 'master' of https://github.com/flotteur/projet_synthese
Service JSON
Service JSON Opérationnel
Chris de GIT...
Merge branch 'master' of https://github.com/flotteur/projet_synthese

Conflicts:
	.gitignore
	Data_synthese/Data_synthese.suo
	Data_synthese/Data_synthese/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Data_synthese/ProjetSynthese.sln
	Data_synthese/ProjetSynthese.suo
	Data_synthese/WCF_Synthese/IServiceWCF_Synthese.cs
	Data_synthese/WCF_Synthese/WCF_Synthese.csproj
	Data_synthese/WCF_Synthese/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
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
Essais de reparation de branche...
Ignorer le fichier .v12.suo
Ignore v12 file
GRRRRRR
On fait encore du ménage
Merge branch 'master' of https://github.com/flotteur/projet_synthese

Conflicts:
	.gitignore
	Data_synthese/BO_Synthese/bin/Debug/BO_Synthese.dll
	Data_synthese/BO_Synthese/bin/Debug/BO_Synthese.pdb
	Data_synthese/BO_Synthese/bin/Debug/Data_synthese.dll
	Data_synthese/BO_Synthese/bin/Debug/Data_synthese.pdb
	Data_synthese/BO_Synthese/bin/Debug/Entites_Synthese.dll
	Data_synthese/BO_Synthese/bin/Debug/Entites_Synthese.pdb
	Data_synthese/BO_Synthese/obj/Debug/BO_Synthese.csprojResolveAssemblyReference.cache
	Data_synthese/BO_Synthese/obj/Debug/BO_Synthese.dll
	Data_synthese/BO_Synthese/obj/Debug/BO_Synthese.pdb
	Data_synthese/BO_Synthese/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Data_synthese/Data_synthese/bin/Debug/Data_synthese.dll
	Data_synthese/Data_synthese/bin/Debug/Data_synthese.pdb
	Data_synthese/Data_synthese/bin/Debug/Entites_Synthese.dll
	Data_synthese/Data_synthese/bin/Debug/Entites_Synthese.pdb
	Data_synthese/Data_synthese/obj/Debug/Data_synthese.csproj.FileListAbsolute.txt
	Data_synthese/Data_synthese/obj/Debug/Data_synthese.csprojResolveAssemblyReference.cache
	Data_synthese/Data_synthese/obj/Debug/Data_synthese.dll
	Data_synthese/Data_synthese/obj/Debug/Data_synthese.pdb
	Data_synthese/Entites_Synthese/bin/Debug/Entites_Synthese.dll
	Data_synthese/Entites_Synthese/bin/Debug/Entites_Synthese.pdb
	Data_synthese/Entites_Synthese/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Data_synthese/Entites_Synthese/obj/Debug/Entites_Synthese.csproj.FileListAbsolute.txt
	Data_synthese/Entites_Synthese/obj/Debug/Entites_Synthese.dll
	Data_synthese/Entites_Synthese/obj/Debug/Entites_Synthese.pdb
	Data_synthese/ProjetSynthese.sln
	Data_synthese/ProjetSynthese.suo
	Data_synthese/ProjetSynthese.v12.suo
	Data_synthese/TEST_Data_Synthese/bin/Debug/Data_synthese.dll
	Data_synthese/TEST_Data_Synthese/bin/Debug/Data_synthese.pdb
	Data_synthese/TEST_Data_Synthese/bin/Debug/Data_synthese_Accessor.dll
	Data_synthese/TEST_Data_Synthese/bin/Debug/Data_synthese_Accessor.pdb
	Data_synthese/TEST_Data_Synthese/bin/Debug/Entites_Synthese.dll
	Data_synthese/TEST_Data_Synthese/bin/Debug/Entites_Synthese.pdb
	Data_synthese/TEST_Data_Synthese/bin/Debug/TEST_Data_Synthese.dll
	Data_synthese/TEST_Data_Synthese/bin/Debug/TEST_Data_Synthese.pdb
	Data_synthese/TEST_Data_Synthese/obj/Debug/Data_synthese_Accessor.dll
	Data_synthese/TEST_Data_Synthese/obj/Debug/Data_synthese_Accessor.pdb
	Data_synthese/TEST_Data_Synthese/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Data_synthese/TEST_Data_Synthese/obj/Debug/TEST_Data_Synthese.csprojResolveAssemblyReference.cache
	Data_synthese/TEST_Data_Synthese/obj/Debug/TEST_Data_Synthese.dll
	Data_synthese/TEST_Data_Synthese/obj/Debug/TEST_Data_Synthese.pdb
	Data_synthese/WCF_Synthese/WCF_Synthese.csproj
	Data_synthese/WCF_Synthese/bin/WCF_Synthese.dll
	Data_synthese/WCF_Synthese/bin/WCF_Synthese.pdb
	Data_synthese/WCF_Synthese/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Data_synthese/WCF_Synthese/obj/Debug/WCF_Synthese.csproj.FileListAbsolute.txt
	Data_synthese/WCF_Synthese/obj/Debug/WCF_Synthese.csprojResolveAssemblyReference.cache
	Data_synthese/WCF_Synthese/obj/Debug/WCF_Synthese.dll
	Data_synthese/WCF_Synthese/obj/Debug/WCF_Synthese.pdb
GRRRRRRRRRRR I HATE YOU V12.SUO
FLUSH V12.suo AGAIN!