modified:   smile_android/gen/com/holding/smile/R.java
	modified:   smile_android/res/layout/header.xml
	modified:   smile_android/src/com/holding/smile/activity/BaseActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainTwoActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   src/com/holding/smile/activity/EmailActivity.java
	modified:   src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   src/com/holding/smile/activity/HtmlUIActivity.java
	modified:   src/com/holding/smile/activity/IdcardEditActivity.java
	modified:   src/com/holding/smile/activity/IdcardManagerActivity.java
	modified:   src/com/holding/smile/activity/LoginActivity.java
	modified:   src/com/holding/smile/activity/MainSmileActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/MyOrdersActivity.java
	modified:   src/com/holding/smile/activity/OrderDetailActivity.java
	modified:   src/com/holding/smile/activity/OrderInformActivity.java
	modified:   src/com/holding/smile/activity/OrderPayActivity.java
	modified:   src/com/holding/smile/activity/PersonalSettingsActivity.java
	modified:   src/com/holding/smile/activity/PhoneActivity.java
		modified:   src/com/holding/smile/activity/RegisterActivity.java
	modified:   src/com/holding/smile/activity/ResetPwdActivity.java
	modified:   src/com/holding/smile/activity/SearchGoodsActivity.java
	modified:   src/com/holding/smile/activity/ShoppingCartActivity.java
	modified:   src/com/holding/smile/activity/SortActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz