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