add
Merge branch 'master' of https://github.com/zywonderful2/daidai800

Conflicts:
	Daidai800/.classpath
	Daidai800/build/classes/com/renrendai/RenrendaiWriterProcessor.class
	Daidai800/build/classes/com/renrendai/crawl-manifest.txt
	Daidai800/build/classes/com/renrendai/crawl-report.txt
	Daidai800/build/classes/com/renrendai/hosts-report.txt
	Daidai800/build/classes/com/renrendai/logs/crawl.log
	Daidai800/build/classes/com/renrendai/logs/progress-statistics.log
	Daidai800/build/classes/com/renrendai/logs/runtime-errors.log
	Daidai800/build/classes/com/renrendai/mimetype-report.txt
	Daidai800/build/classes/com/renrendai/processors-report.txt
	Daidai800/build/classes/com/renrendai/state/00000000.jdb
	Daidai800/build/classes/com/timer/ScheduleJobs.class
	Daidai800/src/com/renrendai/crawl-manifest.txt
	Daidai800/src/com/renrendai/crawl-report.txt
	Daidai800/src/com/renrendai/hosts-report.txt
	Daidai800/src/com/renrendai/logs/crawl.log
	Daidai800/src/com/renrendai/logs/progress-statistics.log
	Daidai800/src/com/renrendai/logs/runtime-errors.log
	Daidai800/src/com/renrendai/mimetype-report.txt
	Daidai800/src/com/renrendai/processors-report.txt
	Daidai800/src/com/renrendai/state/00000000.jdb