modified:   AndroidManifest.xml
	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/activity/CategoryActivity.java
	modified:   src/com/holding/smile/adapter/MyIdcardAdapter.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz