更新消息加密模块；
Merge branch 'master' of https://github.com/hjj2017/xgame

Conflicts:
	server/Xgame/Common/src/xgame/common/TestApp.scala
Merge branch 'master' of https://github.com/hjj2017/xgame
调整目录结构；