modified:   com/holding/smile/activity/MyApplication.java
	modified:   com/holding/smile/activity/ShoppingCartActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
i#	modified:   ../AndroidManifest.xml
	modified:   ../res/layout/shopping_cart_view.xml
	deleted:    com/holding/smile/activity/JPushActivity.java
	modified:   com/holding/smile/activity/MyApplication.java
	modified:   com/holding/smile/activity/ShoppingCartActivity.java
	modified:   com/holding/smile/adapter/MyShoppingCartAdapter.java
	modified:   com/holding/smile/tools/jpush/MyReceiver.java