resolution conflit
resolution conflit
Merge branch 'master' of https://github.com/giacogiac/ducking-bear

Conflicts:
	Administration/bin/Debug/Administration.exe
	Administration/bin/Debug/Administration.pdb
	Administration/bin/Debug/DataLib.dll
	Administration/bin/Debug/DataLib.pdb
	Administration/obj/x86/Debug/Administration.exe
	Administration/obj/x86/Debug/Administration.pdb
	Administration/obj/x86/Debug/ResolveAssemblyReference.cache
	Client/bin/Debug/Client.exe
	Client/bin/Debug/Client.pdb
	Client/obj/x86/Debug/App.g.cs
	Client/obj/x86/Debug/Client.exe
	Client/obj/x86/Debug/Client.pdb
	Client/obj/x86/Debug/Client_MarkupCompile.cache
	Client/obj/x86/Debug/MainWindow.g.cs
	ClientWeb/bin/ClientWeb.dll
	ClientWeb/bin/ClientWeb.pdb
	ClientWeb/obj/Debug/ClientWeb.csproj.FileListAbsolute.txt
	ClientWeb/obj/Debug/ClientWeb.dll
	ClientWeb/obj/Debug/ClientWeb.pdb
	DataLib/bin/Debug/DataLib.dll
	DataLib/bin/Debug/DataLib.pdb
	DataLib/obj/Debug/DataLib.dll
	DataLib/obj/Debug/DataLib.pdb
	ImageTransfertService/obj/Debug/ImageTransfertService.dll
	ImageTransfertService/obj/Debug/ImageTransfertService.pdb
	ducking-bear.suo
enfin