modified:   res/layout/index_item.xml
	modified:   res/layout/index_recommend.xml
	modified:   res/values/strings.xml
	modified:   src/com/holding/smile/activity/MainSmileActivity.java
	modified:   src/com/holding/smile/adapter/BrandAdapter.java
	modified:   src/com/holding/smile/myview/MyViewPager.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	new file:   smile_android/res/drawable/dash_driver.xml
	new file:   smile_android/res/drawable/rect_dash.xml
	modified:   smile_android/res/layout/goods_detail_view.xml
	modified:   smile_android/res/values/strings.xml
	modified:   smile_android/src/com/holding/smile/activity/GoodsDetailActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz