Merge branch 'master' of git.oschina.net:flashsword20/webmagic

Conflicts:
	webmagic-avalon/.classpath
	webmagic-core/.classpath
	webmagic-extension/.classpath
	webmagic-lucene/.classpath
	webmagic-samples/.classpath
	webmagic-saxon/.classpath
	webmagic-scripts/.classpath
	webmagic-selenium/.classpath