deleted:    smile_android/keystore
	modified:   smile_android/res/layout/search_header.xml
	modified:   smile_android/res/values/strings.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz