modified:   ../res/values/strings.xml
	modified:   com/holding/smile/activity/WebViewActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz