Signed-off-by: guoweihome <okguo@126.com>
Merge branch 'master' of https://github.com/hesq/spider.git

Conflicts:
	WebContent/footer.jsp
	WebContent/index.jsp
	WebContent/query_result.jsp
Merge branch 'master' of https://github.com/hesq/spider.git

Conflicts:
	src/com/dot/house/parser/impl/GanJiCellParser.java