modified:   res/layout/color_item.xml
	modified:   res/layout/footer.xml
	modified:   res/layout/order_inform_view.xml
	modified:   res/layout/shopping_cart_item.xml
	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/OrderInformActivity.java
	modified:   src/com/holding/smile/activity/ShoppingCartActivity.java
	modified:   src/com/holding/smile/adapter/MyShoppingCartAdapter.java
	modified:   src/com/holding/smile/dto/OrderDto.java
	modified:   src/com/holding/smile/dto/OrderItem.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   res/layout/order_inform_view.xml
	modified:   src/com/holding/smile/activity/OrderInformActivity.java