modified:   com/holding/smile/activity/CategoryActivity.java
	modified:   com/holding/smile/activity/EmailActivity.java
	modified:   com/holding/smile/activity/GoodsDetailActivity.java
	modified:   com/holding/smile/activity/IdcardManagerActivity.java
	modified:   com/holding/smile/activity/LoginActivity.java
	modified:   com/holding/smile/activity/MainActivity.java
	modified:   com/holding/smile/activity/MainSmileActivity.java
	modified:   com/holding/smile/activity/MainTwoActivity.java
	modified:   com/holding/smile/activity/MyOrdersActivity.java
modified:   com/holding/smile/activity/MySmileActivity.java
	modified:   com/holding/smile/activity/OrderInformActivity.java
	modified:   com/holding/smile/activity/OrderPayActivity.java
modified:   com/holding/smile/activity/PersonalSettingsActivity.java
	modified:   com/holding/smile/activity/PhoneActivity.java
	modified:   com/holding/smile/activity/RegisterActivity.java
	modified:   com/holding/smile/activity/ResetPwdActivity.java
	modified:   com/holding/smile/activity/SearchGoodsActivity.java
	modified:   com/holding/smile/activity/ShoppingCartActivity.java
	modified:   com/holding/smile/activity/SortActivity.java
	modified:   com/holding/smile/activity/WebViewActivity.java
	modified:   com/holding/smile/adapter/BrandAdapter.java
	modified:   com/holding/smile/adapter/MyOrdersAdapter.java
	modified:   com/holding/smile/adapter/VerticalListAdapter.java
	modified:   com/holding/smile/service/LoginService.java
	modified:   com/holding/smile/tools/ClickUtil.java
	modified:   com/holding/smile/tools/CodeValidator.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz