modified:   src/com/holding/smile/activity/MySmileActivity.java
	modified:   src/com/holding/smile/activity/SortActivity.java
	modified:   src/com/holding/smile/adapter/MyJGoodsAdapter.java
	modified:   src/com/holding/smile/cache/ImageLoader.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/activity/SortActivity.java

	modified:   ../smile/pom.xml
	new file:   ../smile/src/main/java/com/flyhz/framework/lang/JPush.java
	modified:   ../smile/src/main/java/com/flyhz/framework/lang/TaobaoData.java
	modified:   ../smile/src/main/java/com/flyhz/shop/dto/UserDto.java
	modified:   ../smile/src/main/java/com/flyhz/shop/persistence/TaobaoDataImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/persistence/dao/OrderDao.java
	modified:   ../smile/src/main/java/com/flyhz/shop/persistence/entity/UserModel.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/OrderService.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/UserService.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   ../smile/src/main/java/com/flyhz/shop/web/controller/LoginController.java
	modified:   ../smile/src/main/java/com/flyhz/shop/web/controller/TaobaoController.java
	modified:   ../smile/src/main/resources/logback.xml
	modified:   ../smile/src/main/resources/mybatis/sqlmap/OrderMapper.xml
	modified:   ../smile/src/main/resources/mybatis/sqlmap/UserMapper.xml
	modified:   AndroidManifest.xml
	new file:   libs/armeabi/libjpush163.so
	new file:   libs/jpush-sdk-release1.6.3.jar
	new file:   res/drawable-hdpi/welcome.png
	new file:   res/drawable/rotate_repeat.xml
	new file:   res/layout/index.xml
	new file:   res/layout/jpush.xml
	modified:   res/layout/my_smile.xml
	modified:   res/values/color.xml
	modified:   res/values/strings.xml
	modified:   res/values/styles.xml
	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/activity/CategoryActivity.java
	modified:   src/com/holding/smile/activity/EmailActivity.java
	modified:   src/com/holding/smile/activity/FindBackPwdActivity.java
	modified:   src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   src/com/holding/smile/activity/IdcardEditActivity.java
	modified:   src/com/holding/smile/activity/IdcardManagerActivity.java
	new file:   src/com/holding/smile/activity/IndexActivity.java
	new file:   src/com/holding/smile/activity/JPushActivity.java
	modified:   src/com/holding/smile/activity/LoginActivity.java
	modified:   src/com/holding/smile/activity/MainActivity.java
	modified:   src/com/holding/smile/activity/MainSmileActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/MyApplication.java
	modified:   src/com/holding/smile/activity/MyOrdersActivity.java
	modified:   src/com/holding/smile/activity/MySmileActivity.java
	modified:   src/com/holding/smile/activity/OrderDetailActivity.java
	modified:   src/com/holding/smile/activity/OrderInformActivity.java
	modified:   src/com/holding/smile/activity/OrderPayActivity.java
	modified:   src/com/holding/smile/activity/PersonalSettingsActivity.java
	modified:   src/com/holding/smile/activity/PhoneActivity.java
	modified:   src/com/holding/smile/activity/RegisterActivity.java
	modified:   src/com/holding/smile/activity/ResetPwdActivity.java
	modified:   src/com/holding/smile/activity/SearchGoodsActivity.java
	modified:   src/com/holding/smile/activity/ShoppingCartActivity.java
	modified:   src/com/holding/smile/activity/SortActivity.java
	modified:   src/com/holding/smile/activity/WebViewActivity.java
	modified:   src/com/holding/smile/adapter/MyOrderInformAdapter.java
	modified:   src/com/holding/smile/adapter/MyShoppingCartAdapter.java
	modified:   src/com/holding/smile/cache/ImageLoader.java
	modified:   src/com/holding/smile/entity/SUser.java
	new file:   src/com/holding/smile/myview/HKDialogLoading.java
	modified:   src/com/holding/smile/service/LoginService.java
	modified:   src/com/holding/smile/service/SubmitService.java
	modified:   src/com/holding/smile/tools/UpdateManager.java
	new file:   src/com/holding/smile/tools/jpush/ExampleUtil.java
	new file:   src/com/holding/smile/tools/jpush/MyReceiver.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz