modified:   ../AndroidManifest.xml
	new file:   ../res/layout/email.xml
	new file:   ../res/layout/phone.xml
	modified:   com/holding/smile/activity/AddressEditActivity.java
	modified:   com/holding/smile/activity/BaseActivity.java
	modified:   com/holding/smile/activity/DeliveryAddressActivity.java
	new file:   com/holding/smile/activity/EmailActivity.java
	modified:   com/holding/smile/activity/PersonalSettingsActivity.java
	new file:   com/holding/smile/activity/PhoneActivity.java
	modified:   com/holding/smile/adapter/MyAddressAdapter.java
	modified:   com/holding/smile/entity/Consignee.java
	new file:   com/holding/smile/entity/IdentitycardDto.java
	new file:   com/holding/smile/entity/UserDto.java
	modified:   com/holding/smile/service/DataService.java
	modified:   com/holding/smile/service/SQLiteService.java
	modified:   com/holding/smile/tools/DBHelper.java
	modified:   com/holding/smile/tools/URLUtil.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz