测试git add
结算界面初步搭建
Merge branch 'master' of https://github.com/runyetech/find-android

Conflicts:
	gen/com/runyetech/find2/R.java
	src/com/runyetech/find2/webservice/WebServiceDataSet.java
jiesuan
的