urlfetcher
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/zju3/timeline/FetchRunnable.java
	src/main/java/org/zju3/timeline/LinkQueue.java
	src/main/java/org/zju3/timeline/MainClass.java
	src/main/java/org/zju3/timeline/UrlFetcher.java