zdupdate
zd
ignore cofilts
update
update
u
myadd
Merge branch 'master' of github.com:cugblbs/cugblbs

Conflicts:
	LBSX/bin/LBSX.apk
	LBSX/bin/classes.dex
	LBSX/bin/classes/com/zd/lbsx/fragments/XFgFind1.class
	LBSX/bin/resources.ap_
添加progressbar