commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProgettoPDS_CLIENT.v11.suo

	ProgettoPDS_CLIENT/obj/Debug/ProgettoPDS_CLIENT.csproj.GenerateResource.Cache