新添加的结算
xml
商品详情界面交互基本完成（有些功能模块界面交互待定，有些问题未处理完）
三个
Merge branch 'master' of https://github.com/runyetech/find-android

Conflicts:
	AndroidManifest.xml
	bin/classes/.gitignore
	gen/com/runyetech/find2/R.java
	res/layout/activity_jiesuan.xml
	res/layout/activity_jiesuan_list_item.xml
	res/layout/activity_jiesuan_order.xml
	res/layout/activity_purchase_buy_quantity.xml
	res/layout/activity_shopping_car_list_item.xml
	src/com/runyetech/find2/JieSuanActivity.java
	src/com/runyetech/find2/JieSuanOrderActivity.java
	src/com/runyetech/find2/ShoppingCarAdapter.java