httpclient4
1
Merge branch 'master' of github.com:nicolas360/my

Conflicts:
	src/main/java/com/zhuc/my/httpclient/utils/HttpProxy4.java