modified:   avengers/src/main/java/com/flyhz/avengers/Client.java
	modified:   avengers/src/main/java/com/flyhz/avengers/framework/util/HbaseUtil.java
	modified:   smile_android/src/com/holding/smile/activity/MainActivity.java
	modified:   smile_android/src/com/holding/smile/myview/MyListView.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

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

	modified:   ../smile/src/main/java/com/flyhz/framework/util/Constants.java
	modified:   ../smile/src/main/java/com/flyhz/shop/dto/UserDto.java
	modified:   ../smile/src/main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   ../smile/src/main/webapp/WEB-INF/tools.xml
	new file:   .cproject
	new file:   .settings/org.eclipse.cdt.codan.core.prefs
	new file:   jni/Android.mk
	new file:   jni/Application.mk
	new file:   jni/com_holding_smile_tools_TbUtil.h
	new file:   jni/curl/curl.h
	new file:   jni/curl/curlbuild.h
	new file:   jni/curl/curlrules.h
	new file:   jni/curl/curlver.h
	new file:   jni/curl/easy.h
	new file:   jni/curl/multi.h
	new file:   jni/curllib/libcurl.a
	new file:   jni/m.cpp
	new file:   libs/armeabi/libjni_curl.so
	new file:   obj/local/armeabi/libjni_curl.so
	new file:   obj/local/armeabi/libm.so
	new file:   obj/local/armeabi/libstdc++.a
	new file:   obj/local/armeabi/objs/jni_curl/m.o
	new file:   obj/local/armeabi/objs/jni_curl/m.o.d
	new file:   obj/local/armeabi/objs/m/m.o
	new file:   obj/local/armeabi/objs/m/m.o.d
	modified:   res/drawable-hdpi/add_btn.png
	new file:   res/drawable-hdpi/add_btn_click.png
	deleted:    res/drawable-hdpi/add_cart_btn.png
	modified:   res/drawable-hdpi/back_normal.png
	modified:   res/drawable-hdpi/back_pressed.png
	deleted:    res/drawable-hdpi/btn_green_pressed.png
	deleted:    res/drawable-hdpi/btn_white_normal.png
	deleted:    res/drawable-hdpi/confirm_btn.png
	modified:   res/drawable-hdpi/dealmoon_cache_icon.png
	renamed:    res/drawable-hdpi/page_indicator_focused.png -> res/drawable-hdpi/empty_photo.png
	modified:   res/drawable-hdpi/icon_choice.png
	modified:   res/drawable-hdpi/icon_delete.png
	modified:   res/drawable-hdpi/icon_no_choice.png
	new file:   res/drawable-hdpi/mainfooter_five.png
	new file:   res/drawable-hdpi/mainfooter_five_click.png
	new file:   res/drawable-hdpi/mainfooter_four.png
	new file:   res/drawable-hdpi/mainfooter_four_click.png
	modified:   res/drawable-hdpi/mainfooter_one.png
	modified:   res/drawable-hdpi/mainfooter_one_click.png
	new file:   res/drawable-hdpi/mainfooter_three.png
	new file:   res/drawable-hdpi/mainfooter_three_click.png
	modified:   res/drawable-hdpi/mainfooter_two.png
	modified:   res/drawable-hdpi/mainfooter_two_click.png
	new file:   res/drawable-hdpi/navigation_bg.png
	modified:   res/drawable-hdpi/nearby_bind_mobile_headerview_icon.png
	deleted:    res/drawable-hdpi/now_buy_btn.png
	modified:   res/drawable-hdpi/page_indicator_focused.png
	modified:   res/drawable-hdpi/page_indicator_unfocused.png
	deleted:    res/drawable-hdpi/payoff.png
	modified:   res/drawable-hdpi/sub_btn.png
	new file:   res/drawable-hdpi/sub_btn_click.png
	new file:   res/drawable-ldpi/add_btn_bg.xml
	new file:   res/drawable-ldpi/addcart_bg.xml
	new file:   res/drawable-ldpi/checkbox_bg.xml
	new file:   res/drawable-ldpi/confirm_bg.xml
	new file:   res/drawable-ldpi/mainfooter_five_bg.xml
	new file:   res/drawable-ldpi/mainfooter_four_bg.xml
	new file:   res/drawable-ldpi/mainfooter_itemcolor.xml
	new file:   res/drawable-ldpi/mainfooter_three_bg.xml
	new file:   res/drawable-ldpi/navigation_bg.xml
	new file:   res/drawable-ldpi/navigation_textcolor.xml
	new file:   res/drawable-ldpi/nowbuy_bg.xml
	modified:   res/drawable-ldpi/search_bg.xml
	new file:   res/drawable-ldpi/sub_btn_bg.xml
	deleted:    res/drawable/corners_bg.xml
	new file:   res/drawable/head_bg.xml
	deleted:    res/drawable/left_corners_bg.xml
	modified:   res/drawable/login_input_bg.xml
	modified:   res/drawable/reg_bg.xml
	deleted:    res/drawable/right_corners_bg.xml
	modified:   res/drawable/selector_bg.xml
	modified:   res/drawable/self_login_bg.xml
	modified:   res/drawable/text_view_bg.xml
	modified:   res/layout/base.xml
	modified:   res/layout/cate_item.xml
	modified:   res/layout/cate_view.xml
	modified:   res/layout/color_item.xml
	modified:   res/layout/email.xml
	modified:   res/layout/footer.xml
	modified:   res/layout/good_pic_item.xml
	modified:   res/layout/goods_detail_view.xml
	modified:   res/layout/goods_sort.xml
	modified:   res/layout/header.xml
	modified:   res/layout/history_search_item.xml
	modified:   res/layout/home_list.xml
	modified:   res/layout/horizontallistview.xml
	modified:   res/layout/horizontallistview_item.xml
	modified:   res/layout/htmlui_view.xml
	modified:   res/layout/idcard_edit.xml
	modified:   res/layout/idcard_list.xml
	modified:   res/layout/idcard_manager.xml
	modified:   res/layout/index_recommend.xml
	modified:   res/layout/login.xml
	modified:   res/layout/my_smile.xml
	modified:   res/layout/myself_layout.xml
	modified:   res/layout/order_detail.xml
	modified:   res/layout/order_detail_product_list.xml
	modified:   res/layout/order_inform_view.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   src/com/holding/smile/activity/MainActivity.java