new file:   ../key
	modified:   AndroidManifest.xml
	modified:   res/layout/my_smile.xml
	modified:   src/com/holding/smile/activity/IdcardEditActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz