modified:   src/com/holding/smile/activity/WebViewActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/activity/WebViewActivity.java

	modified:   src/com/holding/smile/activity/OrderDetailActivity.java
	modified:   src/com/holding/smile/activity/WebViewActivity.java
	modified:   src/com/holding/smile/activity/WebViewActivity.java