new file:   smile_android/res/layout/order_detail_product_list.xml
	modified:   smile_android/res/values/url.xml
	modified:   smile_android/src/com/holding/smile/activity/OrderDetailActivity.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
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/res/values/url.xml

	modified:   smile/src/main/java/com/flyhz/shop/dto/ConsigneeDto.java
	modified:   smile/src/main/java/com/flyhz/shop/dto/IdentitycardDto.java
	modified:   smile/src/main/java/com/flyhz/shop/dto/OrderDto.java
	new file:   smile/src/main/java/com/flyhz/shop/dto/RtnOrderDto.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/dao/IdcardDao.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   smile/src/main/resources/mybatis/sqlmap/ConsigneeMapper.xml
	modified:   smile/src/main/resources/mybatis/sqlmap/IdcardMapper.xml
	new file:   smile_android/res/drawable-hdpi/icon_choice.png
	new file:   smile_android/res/drawable-hdpi/icon_no_choice.png
	new file:   smile_android/res/drawable-hdpi/payoff.png
	modified:   smile_android/res/layout/footer.xml
	modified:   smile_android/res/layout/header.xml
	deleted:    smile_android/res/layout/shoping_cart_view.xml
	new file:   smile_android/res/layout/shopping_cart_item.xml
	new file:   smile_android/res/layout/shopping_cart_view.xml
	modified:   smile_android/res/values/strings.xml
	modified:   smile_android/src/com/holding/smile/activity/BaseActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainActivity.java
	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/MyShoppingCartAdapter.java