modified:   com/holding/smile/activity/BaseActivity.java
	modified:   com/holding/smile/activity/MainActivity.java
	modified:   com/holding/smile/activity/MainSmileActivity.java
	modified:   com/holding/smile/activity/MyApplication.java
	modified:   com/holding/smile/activity/MyOrdersActivity.java
	modified:   com/holding/smile/activity/MySmileActivity.java
	modified:   com/holding/smile/activity/OrderDetailActivity.java
	modified:   com/holding/smile/activity/RegisterActivity.java
	modified:   com/holding/smile/adapter/BrandAdapter.java
	modified:   com/holding/smile/adapter/MyOrderInformAdapter.java
	modified:   com/holding/smile/adapter/MyOrdersAdapter.java
	modified:   com/holding/smile/service/DataService.java
	modified:   com/holding/smile/service/LoginService.java
	modified:   com/holding/smile/service/SubmitService.java
	modified:   com/holding/smile/tools/CodeValidator.java
	modified:   com/holding/smile/tools/StrUtils.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/activity/BaseActivity.java