fenzhi
Merge branch 'test1'

Conflicts:
	test/src/test/EvaluateVo.java