7.29

合并
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/HomeActivity.apk
	bin/classes.dex
	bin/classes/com/custom/vg/list/CustomListView$1.class
	bin/classes/com/custom/vg/list/CustomListView$RefreshCustomThread.class
	bin/classes/com/custom/vg/list/CustomListView.class
	bin/classes/com/example/dsfwe/AdItem.class
	bin/classes/com/example/dsfwe/TagAdapter.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$1.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$3.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$4.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$5.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$AnimateFirstDisplayListener.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$CustomGalleryAdapter.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$DownAdTask.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$DownTagTask.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$InfoAdapter$1.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$InfoAdapter$2.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$InfoAdapter.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$MyAnimation.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$ViewHolder$Ad.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$ViewHolder$Buttons.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$ViewHolder$Userinfo.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$ViewHolder.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity.class
	bin/classes/com/nostra13/example/universalimageloader/R$id.class
	bin/classes/com/nostra13/example/universalimageloader/R$layout.class
	bin/classes/com/nostra13/example/universalimageloader/R$menu.class
	bin/classes/com/nostra13/example/universalimageloader/R$string.class
	bin/classes/com/nostra13/example/universalimageloader/R$style.class
	bin/classes/com/nostra13/example/universalimageloader/R$xml.class
	bin/classes/me/maxwin/view/XListViewFooter.class
	bin/classes/me/maxwin/view/XListViewHeader.class
	bin/resources.ap_
	gen/com/nostra13/example/universalimageloader/R.java
Merge branch 'master' of https://github.com/yqd248866053/WeiZhan
	new file:   bin/res/crunch/drawable/bt_bg.png
	new file:   bin/res/crunch/drawable/bt_blow.png
	new file:   bin/res/crunch/drawable/bt_collect.png
	new file:   bin/res/crunch/drawable/bt_share.png
	new file:   res/drawable/bt_bg.png
	new file:   res/drawable/bt_blow.png
	new file:   res/drawable/bt_collect.png
	new file:   res/drawable/bt_share.png