modified:   AndroidManifest.xml
	new file:   res/layout/order_inform_view.xml
	new file:   res/layout/order_item.xml
	modified:   res/values/strings.xml
	modified:   res/values/url.xml
	modified:   src/com/holding/smile/activity/GoodsDetailActivity.java
	new file:   src/com/holding/smile/activity/OrderInformActivity.java
	new file:   src/com/holding/smile/adapter/MyOrderInformAdapter.java
	modified:   src/com/holding/smile/adapter/VerticalListAdapter.java
	new file:   src/com/holding/smile/dto/BrandDto.java
	new file:   src/com/holding/smile/dto/CouponDto.java
	new file:   src/com/holding/smile/dto/OrderDetailDto.java
	new file:   src/com/holding/smile/dto/OrderDto.java
	new file:   src/com/holding/smile/dto/OrderItem.java
	new file:   src/com/holding/smile/dto/ProductDto.java
	modified:   src/com/holding/smile/dto/RtnValueDto.java
	new file:   src/com/holding/smile/dto/VoucherDto.java
	new file:   src/com/holding/smile/protocol/POrder.java
	modified:   src/com/holding/smile/service/DataService.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz