提交
Merge branch 'master' of https://github.com/tcmaster/HiSite

Conflicts:
	HiSite/src/com/android/utils/StringUtils.java
修正了冲突