asada
Merge branch 'master' of https://github.com/knop/XhUtility

Conflicts:
	com/team4/utils/http/HttpUtility.java