aa
Merge branch 'master' of git@github.com:yshaojie/test-framework.git

Conflicts:
	src/main/java/com/sohu/common/test/util/HttpClientUtil.java