Control management added
Merge branch 'master' of github.com:agulov/PolyJoinProto

Conflicts:
	Client/MainForm.Designer.cs
	Client/MainForm.cs
	Client/MainForm.resx
Merge branch 'master' of github.com:agulov/PolyJoinProto
OpenCV reference fixes