refactoring
refactoring
Merge branch 'master' of https://github.com/KonstantinKolesnik/Typhoon

Conflicts:
	MFE.Net/TCPServer.cs
	MFE.Net/TCPSession.cs
	MFE.Net/WebSocketServer.cs
	Typhoon.Server/Model.cs