start again

lhc is s..........
Merge remote-tracking branch 'origin/ui-wukai' into ui-lhc

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/activity/DetailActivity.class
	bin/classes/com/smallcat/adapter/ClubJoinedAdapter$Category.class
	bin/classes/com/smallcat/adapter/ClubJoinedAdapter$Club.class
	bin/classes/com/smallcat/adapter/ClubJoinedAdapter$Footer.class
	bin/classes/com/smallcat/adapter/FindAdapter$Activity.class
	bin/classes/com/smallcat/adapter/FindAdapter$Category.class
	bin/classes/com/smallcat/fragment/ClubFragment.class
	bin/classes/com/smallcat/fragment/DetailFragment.class
	bin/classes/com/smallcat/fragment/FindFragment.class
	bin/classes/com/smallcat/fragment/MainFragment.class
	bin/classes/com/smallcat/fragment/MeFragment.class
	bin/classes/com/smallcat/widget/PagerSlidingTabStrip.class
	bin/resources.ap_
	bin/zoo.apk
	gen/com/example/smallcat/R.java