modified:   res/layout/activity_main.xml
	modified:   res/layout/home_list.xml
	new file:   res/layout/myself_layout.xml
	modified:   res/layout/recommend_good_item.xml
	modified:   res/values/strings.xml
	modified:   src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/MyApplication.java
	modified:   src/com/holding/smile/adapter/MyJGoodsAdapter.java
	new file:   src/com/holding/smile/myview/MyLinearLayout.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   res/layout/search_goods_view.xml
	modified:   src/com/holding/smile/activity/SearchGoodsActivity.java