Merge https://github.com/EdwardLee03/httpclient-x

Conflicts:
	src/main/resource/http.config.properties