add
add
修改文件
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/macken/dbsearch/crawler/CrawlerSchedule.java
	src/com/macken/dbsearch/crawler/CrawlerThread.java