renamed:    main/java/com/flyhz/framework/util/Taobao.java -> main/java/com/flyhz/framework/util/TaobaoTokenUtil.java
	modified:   main/java/com/flyhz/shop/persistence/TaobaoDataImpl.java
	new file:   test/java/com/flyhz/shop/TaobaoSdkMessage.java
	modified:   ../../smile_android/src/com/holding/smile/activity/BaseActivity.java
	modified:   ../../smile_android/src/com/holding/smile/activity/OrderInformActivity.java
	modified:   ../../smile_android/src/com/holding/smile/activity/RegisterActivity.java
	modified:   ../../smile_android/src/com/holding/smile/service/SubmitService.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz