dsads
Merge branch 'test' of https://github.com/wangfuyi/GitTestCase.git into
test

Conflicts:
	GitTestCase/src/com/fantasia/util/StringUtil.java