modified:   smile_android/AndroidManifest.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   smile_android/AndroidManifest.xml
	modified:   smile_android/res/values/url.xml