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

Conflicts:
	Administration/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ImageTransfertService/bin/DataLib.dll
	ImageTransfertService/bin/DataLib.pdb
	ImageTransfertService/bin/ImageTransfertService.dll
	ImageTransfertService/bin/ImageTransfertService.pdb
	ducking-bear.suo
Merge branch 'master' of https://github.com/giacogiac/ducking-bear

Conflicts:
	ClientAdmin/Program.cs
	ImageTransfertService/bin/DataLib.dll
	ImageTransfertService/bin/DataLib.pdb
	ImageTransfertService/bin/ImageTransfertService.dll
	ImageTransfertService/bin/ImageTransfertService.pdb
	ducking-bear.suo