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