modified:   ../../smile/src/main/java/com/flyhz/framework/lang/TaobaoData.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/persistence/TaobaoDataImpl.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   ../../smile/src/main/resources/exception.properties
	new file:   drawable-hdpi/acs_artificial.png
	modified:   layout/my_smile.xml
	modified:   values/dimens.xml
	modified:   values/strings.xml
	modified:   ../src/com/holding/smile/activity/EmailActivity.java
	modified:   ../src/com/holding/smile/activity/MySmileActivity.java
	modified:   ../src/com/holding/smile/activity/PersonalSettingsActivity.java
	modified:   ../src/com/holding/smile/activity/PhoneActivity.java
	modified:   ../src/com/holding/smile/entity/SUser.java
	modified:   ../src/com/holding/smile/service/SQLiteService.java
	modified:   ../src/com/holding/smile/tools/DBHelper.java
	modified:   ../src/com/holding/smile/tools/jpush/MyReceiver.java