modify the protocol
merge the protocol
Merge branch 'master' of https://github.com/lzz5235/ChatOnline

Conflicts:
	Server/protocol.h