modified:   ../AndroidManifest.xml
	modified:   ../res/values/strings.xml
	modified:   com/holding/smile/activity/IdcardEditActivity.java
	modified:   com/holding/smile/activity/ImageViewActivity.java
	modified:   com/holding/smile/activity/IndexActivity.java
	modified:   com/holding/smile/activity/PersonalSettingsActivity.java
	modified:   com/holding/smile/adapter/MyOrdersAdapter.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/adapter/MyOrdersAdapter.java