Merge branch 'master' of https://github.com/xieke/crawler

Conflicts:
	src/sand/util/HttpRequestDeviceUtils.java
为什么会修改别人的类呢?
Merge branch 'master' of https://github.com/xieke/crawler

Conflicts:
	src/sand/util/HttpRequestDeviceUtils.java
Merge branch 'master' of https://github.com/xieke/crawler