modified:   smile_android/src/com/holding/smile/activity/CategoryActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainActivity.java
	modified:   smile_android/src/com/holding/smile/adapter/VerticalListAdapter.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   smile_android/res/layout/order_pay_view.xml
	modified:   smile_android/src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainTwoActivity.java
	modified:   smile_android/src/com/holding/smile/activity/OrderPayActivity.java
	modified:   smile_android/src/com/holding/smile/adapter/HorizontalGridViewAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/MyJGoodsAdapter.java
	modified:   smile_android/src/com/holding/smile/service/SubmitService.java