哈哈哈

急急急
ddd
dds
ssa
Merge branch 'master' of https://github.com/ZpzChinaMobileAndroid/PROJ_Master

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/PROJ_Master.apk
	bin/classes.dex
	bin/classes/com/zhongji/master/android/phone/R$drawable.class
	bin/classes/com/zhongji/master/android/phone/R$id.class
	bin/classes/com/zhongji/master/android/phone/R$layout.class
	bin/classes/com/zhongji/master/android/phone/R$string.class
	bin/classes/com/zhongji/master/android/phone/R$style.class
	bin/classes/com/zhongji/master/android/phone/login/LoginActivity.class

bin/classes/com/zhongji/master/android/phone/login/RegisterActivity.clas
s
	bin/res/crunch/drawable-xhdpi/register_fond.png
	bin/resources.ap_
	gen/com/zhongji/master/android/phone/R.java