Prepare for merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	DoubanGrabber/src/com/frank/grabber/movieid/errorhandler/MovieIDMultithreadErrorHandler.java
加入电影抓取多线程