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