提交
Merge branch 'master' of https://github.com/wangfeng520/MinaServer.git

Conflicts:
	MinaServer/src/com/xy/game/message/handler/LoginHandler.java