modified:   res/layout/home_list.xml
	modified:   res/layout/horizontallistview.xml
	modified:   res/layout/horizontallistview_item.xml
	modified:   res/values/url.xml
	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   src/com/holding/smile/activity/MainActivity.java
	modified:   src/com/holding/smile/adapter/HorizontalGridViewAdapter.java
	modified:   src/com/holding/smile/adapter/MyJGoodsAdapter.java
	modified:   src/com/holding/smile/adapter/RecommendGoodsAdapter.java
	modified:   src/com/holding/smile/dto/RtnValueDto.java
	new file:   src/com/holding/smile/entity/JActivity.java
	modified:   src/com/holding/smile/entity/JGoods.java
	new file:   src/com/holding/smile/entity/JIndexJGoods.java
	new file:   src/com/holding/smile/entity/JSort.java
	new file:   src/com/holding/smile/protocol/PGoodsDetail.java
	new file:   src/com/holding/smile/protocol/PIndexJGoods.java
	new file:   src/com/holding/smile/protocol/PSort.java
	modified:   src/com/holding/smile/service/DataService.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/activity/MainActivity.java