rb
Merge branch 'master' of https://github.com/IAChineseChess/ChineseChess

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	src/com/yuze/socket/SocketSerivceBACK.java