Merge branch 'master' of https://github.com/cloudsharl/crawler

Conflicts:
	crawler-core/src/main/java/com/zxsoft/crawler/CrawlerServer.java
	crawler-core/src/main/resources/application.properties
	crawler-dao/src/main/java/com/zxsoft/crawler/duplicate/DuplicateInspector.java
	crawler-dao/src/main/java/com/zxsoft/crawler/urlbase/impl/UrlbaseRedisFactory.java
	crawler-dao/src/main/java/com/zxsoft/crawler/urlbase/redis/RedisUrlbaseFactory.java
	crawler-dao/src/main/java/com/zxsoft/crawler/urlbase/redis/UrlbaseRedisFactory.java
Merge branch 'master' of https://github.com/cloudsharl/crawler

Conflicts:
	crawler-core/src/main/java/com/zxsoft/crawler/CrawlerServer.java
	crawler-dao/src/main/java/com/zxsoft/crawler/urlbase/impl/RedisUrlbaseFactory.java
	crawler-dao/src/main/java/com/zxsoft/crawler/urlbase/redis/RedisUrlbaseFactory.java
	crawler-dao/src/main/java/com/zxsoft/crawler/urlbase/redis/UrlbaseRedisFactory.java