zxczxxczxczxc
test get back
Merge branch 'master' of https://github.com/IAChineseChess/ChineseChess

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ChineseChess.apk
	bin/classes.dex
	bin/classes/com/example/chinesechess/R$drawable.class
	bin/classes/com/example/chinesechess/R$id.class
	bin/classes/com/example/chinesechess/R$layout.class
	bin/classes/com/example/chinesechess/R$menu.class
	bin/classes/com/example/chinesechess/R$string.class
	bin/classes/com/example/chinesechess/R$style.class
	bin/resources.ap_
	gen/com/example/chinesechess/R.java
	res/layout/regist_dialog.xml