Signed-off-by: sandwind <sandwind@163.com>
Merge branch 'master' of https://github.com/donsunsoft/webmagic

Conflicts:
	webmagic-samples/src/main/java/us/codecraft/webmagic/samples/AmazonItemPageProcessor.java