modified:   smile_android/res/layout/search_header.xml
	modified:   smile_android/src/com/holding/smile/activity/BaseActivity.java
	modified:   smile_android/src/com/holding/smile/activity/SearchGoodsActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   smile_android/src/com/holding/smile/activity/BaseActivity.java