update
Merge branch 'master' of https://github.com/gsh199449/DistributedCrawler

Conflicts:
	src/main/java/com/gs/indexer/solr/SolrSearcher.java
finish the new Tencent Extractor