deleted:    ../../smile/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto_1386219133748-20140508.jar
	modified:   com/holding/smile/activity/MyOrdersActivity.java
	modified:   com/holding/smile/activity/OrderDetailActivity.java
	modified:   com/holding/smile/adapter/MyOrdersAdapter.java
	modified:   com/holding/smile/dto/LogisticsDto.java
:	modified:   ../gen/com/holding/smile/R.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   ../pom.xml
	modified:   main/java/com/flyhz/shop/persistence/TaobaoDataImpl.java
	modified:   main/java/com/flyhz/shop/persistence/dao/OrderDao.java
	modified:   main/java/com/flyhz/shop/service/OrderService.java
	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/OrderController.java
	modified:   main/resources/mybatis/sqlmap/OrderMapper.xml
	modified:   ../../smile_android/AndroidManifest.xml
	modified:   ../../smile_android/libs/armeabi/libjni_curl.so
	modified:   ../../smile_android/res/layout/order_detail.xml