to merge into dev branch
Merge branch 'dev' into my-dev-branch-1

Conflicts:
	src/spider/crawl/core/BaseCrawl.java
	
conflicts merged