test
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
gitignore
gitignore
gitignore
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/activity/LoginActivity$1.class
	bin/classes/com/smallcat/activity/LoginActivity$UserLoginTask.class
	bin/classes/com/smallcat/activity/LoginActivity.class
	bin/classes/com/smallcat/activity/MainActivity$MyPagerAdapter.class
	bin/classes/com/smallcat/activity/MainActivity.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$1.class
	bin/classes/com/smallcat/adapter/FindAdapter$2.class
	bin/classes/com/smallcat/adapter/FindAdapter$3.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/ClubFragment.class
	bin/classes/com/smallcat/fragment/DetailFragment.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/classes/com/smallcat/fragment/MainFragment.class
	bin/classes/com/smallcat/fragment/MeFragment.class
	bin/classes/com/smallcat/widget/ImageTextButton.class
	bin/classes/uk/co/senab/actionbarpulltorefresh/library/R$layout.class
	bin/resources.ap_
	bin/zoo.apk
	gen/com/example/smallcat/R.java
	gen/uk/co/senab/actionbarpulltorefresh/library/R.java
	project.properties
	res/values/strings.xml
	src/com/smallcat/adapter/FindAdapter.java
	src/com/smallcat/fragment/FindFragment.java
to merge
to merge 2
Merge branch 'ui-wukai' into ui-lhc

Conflicts:
	bin/classes/com/smallcat/adapter/FindAdapter$1.class
	bin/classes/com/smallcat/adapter/FindAdapter$2.class
	bin/classes/com/smallcat/adapter/FindAdapter$3.class
	bin/classes/com/smallcat/adapter/FindAdapter.class
	project.properties
to merge 5
Merge remote-tracking branch 'origin/ui-lhc' into ui-wukai

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/classes.dex
	bin/classes/com/example/smallcat/R$dimen.class
	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$1.class
	bin/classes/com/smallcat/activity/DetailActivity.class
	bin/classes/com/smallcat/activity/LoginActivity$1.class
	bin/classes/com/smallcat/activity/LoginActivity$UserLoginTask.class
	bin/classes/com/smallcat/activity/LoginActivity.class
	bin/classes/com/smallcat/activity/MainActivity$MyPagerAdapter.class
	bin/classes/com/smallcat/activity/MainActivity.class
	bin/classes/com/smallcat/activity/ManagerActivity.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$1.class
	bin/classes/com/smallcat/adapter/FindAdapter$2.class
	bin/classes/com/smallcat/adapter/FindAdapter$3.class
	bin/classes/com/smallcat/adapter/FindAdapter$Activity.class
	bin/classes/com/smallcat/adapter/FindAdapter$Category.class
	bin/classes/com/smallcat/adapter/FindAdapter$Header.class
	bin/classes/com/smallcat/adapter/FindAdapter.class
	bin/classes/com/smallcat/fragment/DetailFragment$1.class
	bin/classes/com/smallcat/fragment/DetailFragment$2.class
	bin/classes/com/smallcat/fragment/DetailFragment.class
	bin/classes/com/smallcat/fragment/FindFragment$1.class
	bin/classes/com/smallcat/fragment/FindFragment.class
	bin/classes/com/smallcat/fragment/MainFragment.class
	bin/classes/com/smallcat/fragment/ManagerFragment.class
	bin/classes/com/smallcat/fragment/MeFragment.class
	bin/classes/com/smallcat/widget/ImageTextButton.class
	bin/classes/com/smallcat/widget/PagerSlidingTabStrip.class
	bin/classes/uk/co/senab/actionbarpulltorefresh/library/R$layout.class
	bin/resources.ap_
	bin/zoo.apk
	gen/com/example/smallcat/R.java
	gen/uk/co/senab/actionbarpulltorefresh/library/R.java
	project.properties
	res/values/strings.xml
	res/values/styles.xml