modified:   smile_android/src/com/holding/smile/activity/OrderInformActivity.java
	modified:   smile_android/src/com/holding/smile/activity/ShoppingCartActivity.java
	modified:   smile_android/src/com/holding/smile/adapter/MyOrderInformAdapter.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/adapter/MyOrderInformAdapter.java

	modified:   smile/src/main/java/com/flyhz/shop/dto/RtnOrderDto.java
	modified:   smile/src/main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   smile_android/AndroidManifest.xml
	deleted:    smile_android/res/layout/address_edit.xml
	deleted:    smile_android/res/layout/address_list.xml
	deleted:    smile_android/res/layout/address_manager.xml
	new file:   smile_android/res/layout/order_detail_product_list.xml
	modified:   smile_android/res/values/url.xml
	deleted:    smile_android/src/com/holding/smile/activity/AddressEditActivity.java
	deleted:    smile_android/src/com/holding/smile/activity/AddressManagerActivity.java
	modified:   smile_android/src/com/holding/smile/activity/IdcardEditActivity.java
	modified:   smile_android/src/com/holding/smile/activity/OrderDetailActivity.java
	modified:   smile_android/src/com/holding/smile/activity/OrderInformActivity.java
	deleted:    smile_android/src/com/holding/smile/adapter/MyAddressAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/MyIdcardAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/MyOrderInformAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/MyOrdersAdapter.java
	new file:   smile_android/src/com/holding/smile/adapter/OrderDetailAdapter.java
	modified:   smile_android/src/com/holding/smile/entity/Consignee.java
	modified:   smile_android/src/com/holding/smile/entity/Idcard.java
	modified:   smile_android/src/com/holding/smile/service/DataService.java
	modified:   smile_android/src/com/holding/smile/service/SubmitService.java