update Server
Merge remote-tracking branch 'origin/master'

Conflicts:
	PrivateChat/PrivateChat/bin/Release/PrivateChat.exe
	PrivateChat/PrivateChat/bin/Release/PrivateChat.pdb
	PrivateChat/PrivateChat/obj/Release/PrivateChat.exe
	PrivateChat/PrivateChat/obj/Release/PrivateChat.pdb