Modify the build.xml encode
Add function
Merge branch 'master' of https://github.com/dyzhxsl3897/utils

Conflicts:
	src/com/dyzhxsl/utils/StringUtil.java