deleted:    gen/com/holding/smile/BuildConfig.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   res/layout/shopping_cart_item.xml
	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/activity/ShoppingCartActivity.java
	modified:   src/com/holding/smile/adapter/MyShoppingCartAdapter.java