modified:   AndroidManifest.xml
	modified:   res/layout/my_smile.xml
	modified:   res/layout/order_list.xml
	modified:   res/values/strings.xml
	modified:   src/com/holding/smile/activity/GoodsBigImgActivity.java
	modified:   src/com/holding/smile/activity/MySmileActivity.java
	modified:   src/com/holding/smile/tools/ClickUtil.java
	modified:   src/com/holding/smile/tools/UpdateManager.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz