modified:   smile_android/AndroidManifest.xml
	new file:   smile_android/res/layout/address_edit.xml
	new file:   smile_android/res/layout/delivery_address.xml
	modified:   smile_android/res/layout/personal_settings.xml
	modified:   smile_android/res/values/color.xml
	modified:   smile_android/res/values/strings.xml
	new file:   smile_android/src/com/holding/smile/activity/AddressEditActivity.java
	new file:   smile_android/src/com/holding/smile/activity/DeliveryAddressActivity.java
	modified:   smile_android/src/com/holding/smile/activity/PersonalSettingsActivity.java
	new file:   smile_android/src/com/holding/smile/entity/CItem.java
	new file:   smile_android/src/com/holding/smile/entity/City.java
	new file:   smile_android/src/com/holding/smile/entity/District.java
	new file:   smile_android/src/com/holding/smile/entity/Province.java
	modified:   smile_android/src/com/holding/smile/service/SQLiteService.java
	modified:   smile_android/src/com/holding/smile/tools/DBHelper.java
	new file:   smile_android/src/com/holding/smile/tools/ProvinceCityUtil.java
	modified:   smile_nodejs/requestHandlers.js
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/res/values/strings.xml
	smile_android/src/com/holding/smile/service/SQLiteService.java
	smile_android/src/com/holding/smile/tools/DBHelper.java

	modified:   smile/src/main/java/com/flyhz/framework/util/MD5.java
	modified:   smile/src/main/java/com/flyhz/shop/service/UserService.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/web/controller/LoginController.java
	modified:   smile_android/AndroidManifest.xml
	new file:   smile_android/res/drawable-hdpi/page_indicator_focused.png
	new file:   smile_android/res/drawable-hdpi/page_indicator_unfocused.png
	new file:   smile_android/res/drawable/login_input_bg.xml
	new file:   smile_android/res/drawable/reg_bg.xml
	new file:   smile_android/res/drawable/self_login_bg.xml
	modified:   smile_android/res/layout/activity_main.xml
	new file:   smile_android/res/layout/login.xml
	modified:   smile_android/res/layout/smile_main.xml
	new file:   smile_android/res/raw/client1.bks
	modified:   smile_android/res/values/strings.xml
	modified:   smile_android/res/values/url.xml
	modified:   smile_android/src/com/holding/smile/activity/BaseActivity.java
	new file:   smile_android/src/com/holding/smile/activity/LoginActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MainActivity.java
	modified:   smile_android/src/com/holding/smile/activity/MyApplication.java
	new file:   smile_android/src/com/holding/smile/adapter/MyPagerAdapter.java
	new file:   smile_android/src/com/holding/smile/dto/RtnLoginDto.java
	new file:   smile_android/src/com/holding/smile/entity/SUser.java
	new file:   smile_android/src/com/holding/smile/service/LoginService.java
	modified:   smile_android/src/com/holding/smile/service/SQLiteService.java
	modified:   smile_android/src/com/holding/smile/tools/DBHelper.java
	modified:   smile_android/src/com/holding/smile/tools/JSONUtil.java
	new file:   smile_android/src/com/holding/smile/tools/NullHostNameVerifier.java
	new file:   smile_android/src/com/holding/smile/tools/NullX509TrustManager.java