PJP-21
Merge branch 'master' of github.com:agulov/PolyJoinProto

Conflicts:
	Client/MainForm.cs