合并
Merge branch 'master' of https://github.com/lichzero/WeiZhan into lichzero-master

Conflicts:
	bin/HomeActivity.apk
	bin/classes.dex
	bin/classes/com/example/yuyin/BlowDialog$1.class
	bin/classes/com/example/yuyin/BlowDialog$2.class
	bin/classes/com/example/yuyin/BlowDialog$3.class
	bin/classes/com/example/yuyin/BlowDialog.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$1.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$2.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$6.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$7.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$8.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$9.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$AnimateFirstDisplayListener.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$DownAdTask.class
	bin/classes/com/nostra13/example/universalimageloader/ImageListActivity$DownBlowFlagTask.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/resources.ap_
	src/com/example/yuyin/BlowDialog.java
	src/com/nostra13/example/universalimageloader/ImageListActivity.java
Merge branch 'lichzero-master'