Merge
Short的编码已经完成了，相信其它的也快啦
Merge branch 'master' of https://github.com/CaoXiaoMeng/test0.git

Conflicts:
	JavaApplication1/src/protocol/impls/Coding.java
	JavaApplication1/src/util/BytesUtils.java