modified:   smile_android/AndroidManifest.xml
	modified:   smile_android/src/com/holding/smile/activity/AddressEditActivity.java
	renamed:    smile_android/src/com/holding/smile/activity/DeliveryAddressActivity.java -> smile_android/src/com/holding/smile/activity/AddressManagerActivity.java
	modified:   smile_android/src/com/holding/smile/activity/BaseActivity.java
	modified:   smile_android/src/com/holding/smile/activity/EmailActivity.java
	modified:   smile_android/src/com/holding/smile/activity/PersonalSettingsActivity.java
	modified:   smile_android/src/com/holding/smile/activity/PhoneActivity.java
	modified:   smile_android/src/com/holding/smile/service/SubmitService.java
	modified:   smile_android/src/com/holding/smile/tools/DBHelper.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz