test
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