modified:   res/layout/good_pic_item.xml
	modified:   res/layout/index_item.xml
	modified:   res/layout/pager_pic_item.xml
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/SortActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   AndroidManifest.xml
	modified:   src/com/holding/smile/activity/MainSmileActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/SortActivity.java
	modified:   src/com/holding/smile/adapter/BrandAdapter.java
	modified:   src/com/holding/smile/adapter/MyJGoodsAdapter.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   src/com/holding/smile/activity/MainSmileActivity.java