modified:   smile_android/res/layout/index_recommend.xml
	modified:   smile_android/src/com/holding/smile/activity/FindBackPwdActivity.java
	modified:   smile_android/src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainSmileActivity.java
	modified:   smile_android/src/com/holding/smile/adapter/MyPagerAdapter.java
	modified:   smile_android/src/com/holding/smile/myview/MyViewPager.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz