some small thing to merge into develop
Merge remote-tracking branch 'origin/ui-lhc' into develop
sliding up comments & category
Club Main
Merge remote-tracking branch 'origin/ui-wukai' into ui-lhc

Conflicts:
	bin/R.txt
	bin/classes.dex
	bin/classes/com/example/smallcat/R$attr.class
	bin/classes/com/example/smallcat/R$bool.class
	bin/classes/com/example/smallcat/R$color.class
	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/ClubDetailActivity.class
	bin/classes/com/smallcat/activity/ClubHomeActivity$SectionsPagerAdapter.class
	bin/classes/com/smallcat/activity/ClubHomeActivity.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.class
	bin/classes/com/smallcat/adapter/FindAdapter$Category.class
	bin/classes/com/smallcat/adapter/FindAdapter$Header.class
	bin/classes/com/smallcat/fragment/FindFragment.class
	bin/classes/com/smallcat/fragment/HomeFragment.class
	bin/classes/com/smallcat/fragment/MeFragment.class
	bin/classes/com/smallcat/widget/ImageTextButton.class
	bin/classes/com/smallcat/widget/PagerSlidingTabStrip.class
	bin/classes/fr/castorflex/android/smoothprogressbar/R$attr.class
	bin/classes/fr/castorflex/android/smoothprogressbar/R$color.class
	bin/classes/fr/castorflex/android/smoothprogressbar/R$dimen.class
	bin/classes/fr/castorflex/android/smoothprogressbar/R$id.class
	bin/classes/fr/castorflex/android/smoothprogressbar/R$string.class
	bin/classes/fr/castorflex/android/smoothprogressbar/R$styleable.class
	bin/classes/uk/co/senab/actionbarpulltorefresh/library/R$attr.class
	bin/classes/uk/co/senab/actionbarpulltorefresh/library/R$color.class
	bin/classes/uk/co/senab/actionbarpulltorefresh/library/R$dimen.class
	bin/classes/uk/co/senab/actionbarpulltorefresh/library/R$id.class
	bin/classes/uk/co/senab/actionbarpulltorefresh/library/R$string.class
	bin/classes/uk/co/senab/actionbarpulltorefresh/library/R$styleable.class
	bin/resources.ap_
	bin/zoo.apk
	gen/com/example/smallcat/R.java
	gen/fr/castorflex/android/smoothprogressbar/R.java
	gen/uk/co/senab/actionbarpulltorefresh/library/R.java
	res/layout/activity_detail.xml
Merge remote-tracking branch 'origin/ui-lhc' into develop

Conflicts:
	bin/R.txt
	bin/classes.dex
	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/ClubDetailActivity.class
	bin/classes/com/smallcat/activity/ClubHomeActivity.class
	bin/classes/com/smallcat/adapter/FindAdapter$Category.class
	bin/dexedLibs/appcompat_v7-17cb3ae212ae405d2f24bbce8eafb831.jar
	bin/dexedLibs/datetimepicker-library-0287ccf02c6819052a8f9b1f9a568581.jar
	bin/dexedLibs/library_datetime-955bc15d0eb6924804719a62671dfd66.jar
	bin/dexedLibs/pullrorefresh-329d825f6e5a37d8af10b349b0b11fb8.jar
	bin/dexedLibs/smoothprogressbar-6bedefa9d311b8f6883e4080ae2bd7f7.jar
	bin/resources.ap_
	bin/zoo.apk
	gen/com/example/smallcat/R.java
	res/layout/activity_detail.xml
	res/layout/include_header_home.xml