modified:   smile_android/res/layout/order_item.xml
	modified:   smile_android/res/layout/order_list.xml
	modified:   smile_android/res/layout/order_manager.xml
	modified:   smile_android/res/values/color.xml
	modified:   smile_android/src/com/holding/smile/activity/MyOrdersActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MySmileActivity.java
	modified:   smile_android/src/com/holding/smile/activity/SearchGoodsActivity.java
	modified:   smile_android/src/com/holding/smile/adapter/MyOrderInformAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/MyOrdersAdapter.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz