add condition
Merge branch 'master' of https://github.com/wangfuyi/GitTestCase.git

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