注册整合
注册整合
debug
13
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	bin/classes.dex
	bin/classes/com/crazyfish/activity/fragment/HomeFragment$1$1.class
	bin/demo.apk
	bin/resources.ap_