没改
编辑收货地址部分小改动
Merge branch 'master' of https://github.com/runyetech/find-android

Conflicts:
	bin/AndroidManifest.xml
	bin/classes/.gitignore
	gen/com/runyetech/find2/R.java