nimei
Merge remote-tracking branch 'origin/master'

Conflicts:
	DoubanGrabber/bin/com/frank/grabber/movieid/errorhandler/MovieIDErrorHandler.class
	DoubanGrabber/src/com/frank/grabber/movieid/errorhandler/MovieIDErrorHandler.java


Signed-off-by: frank19900731 <scr_0731@126.com>