fix image bug
Merge remote-tracking branch 'origin/ui-wukai' into ui-wukai

Conflicts:
	bin/R.txt
	bin/classes.dex
	bin/classes/com/example/smallcat/R$drawable.class
	bin/classes/com/example/smallcat/R$id.class
	bin/classes/com/example/smallcat/R$integer.class
	bin/classes/com/example/smallcat/R$layout.class
	bin/classes/com/example/smallcat/R$menu.class
	bin/classes/com/example/smallcat/R$string.class
	bin/classes/com/example/smallcat/R$style.class
	bin/classes/com/example/smallcat/R$styleable.class
	bin/classes/com/smallcat/adapter/FindAdapter$Activity$1.class
	bin/classes/com/smallcat/adapter/FindAdapter$Activity.class
	bin/classes/com/smallcat/adapter/FindAdapter$ActivityViewHolder.class
	bin/classes/com/smallcat/adapter/FindAdapter$Category.class
	bin/classes/com/smallcat/adapter/FindAdapter$CategoryViewHolder.class
	bin/classes/com/smallcat/adapter/FindAdapter$Header.class
	bin/classes/com/smallcat/adapter/FindAdapter$HeaderViewHolder.class
	bin/classes/com/smallcat/adapter/FindAdapter$Row.class
	bin/classes/com/smallcat/adapter/FindAdapter$ViewHolder.class
	bin/classes/com/smallcat/adapter/FindAdapter.class
	bin/classes/com/smallcat/fragment/FindFragment$1.class
	bin/classes/com/smallcat/fragment/FindFragment$2$1.class
	bin/classes/com/smallcat/fragment/FindFragment$2.class
	bin/classes/com/smallcat/fragment/FindFragment$3.class
	bin/classes/com/smallcat/fragment/FindFragment.class
	bin/dexedLibs/pullrorefresh-329d825f6e5a37d8af10b349b0b11fb8.jar
	bin/dexedLibs/smoothprogressbar-6bedefa9d311b8f6883e4080ae2bd7f7.jar
	bin/resources.ap_
	bin/zoo.apk
	gen/com/example/smallcat/R.java
	src/com/smallcat/adapter/FindAdapter.java
Merge remote-tracking branch 'origin/ui-wukai' into ui-lhc