1.0.6b
Merge branch 'master' of https://github.com/backoffbelief/chatServer.git

Conflicts:
	src/main/java/com/peach/chat/server/ChatServer.java
	src/main/java/com/peach/chat/service/ChatService.java
	src/main/java/com/peach/chat/service/impl/ChatServiceImpl.java
	src/main/proto/chatMsg.proto
	src/main/proto/com/peach/chat/ChatMsgProtocolBuffer.java