u
Merge branch 'master' of https://github.com/comaple/KDD

Conflicts:
	scrawler/src/main/resources/dat/news/seeds.dat
	scrawler/src/main/resources/dat/news/templates.dat
	scrawler/src/main/resources/template/news/chinadaily.template
	scrawler/src/main/resources/template/news/dzwww.template
	scrawler/src/main/resources/template/news/educationusa.template
	scrawler/src/main/resources/template/news/indexedu.template
	scrawler/src/main/resources/template/news/oxbridgedu.template
	scrawler/src/main/resources/template/news/strongstudy.template
	scrawler/src/main/resources/template/news/usaer.template
	scrawler/src/test/java/cn/edu/hfut/webcollector/generator/TestStandardGenerator.java