modified:   src/com/holding/smile/adapter/MyPagerAdapter.java
	modified:   src/com/holding/smile/tools/URLUtil.java
	modified:   src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/SearchGoodsActivity.java
	modified:   src/com/holding/smile/activity/SortActivity.java
	modified:   src/com/holding/smile/adapter/MyPagerAdapter.java
	modified:   src/com/holding/smile/tools/URLUtil.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz