Javadoc update
Merge branch 'master' of github.com:dkuntz2/java-httpserver

Conflicts:
	javadoc/allclasses-frame.html
	javadoc/allclasses-noframe.html
	javadoc/constant-values.html
	javadoc/demo/DemoDriver.html
	javadoc/demo/DemoHTTPHandlerFactory.html
	javadoc/demo/FileHandler.html
	javadoc/demo/HelloHandler.html
	javadoc/demo/MathHandler.html
	javadoc/demo/package-frame.html
	javadoc/demo/package-summary.html
	javadoc/demo/package-tree.html
	javadoc/deprecated-list.html
	javadoc/help-doc.html
	javadoc/httpserver/HTTPException.html
	javadoc/httpserver/HTTPHandler.html
	javadoc/httpserver/HTTPHandlerFactory.html
	javadoc/httpserver/HTTPRequest.html
	javadoc/httpserver/HTTPResponse.html
	javadoc/httpserver/HTTPServer.html
	javadoc/httpserver/MessageHandler.html
	javadoc/httpserver/package-frame.html
	javadoc/httpserver/package-summary.html
	javadoc/httpserver/package-tree.html
	javadoc/index-all.html
	javadoc/index.html
	javadoc/overview-frame.html
	javadoc/overview-summary.html
	javadoc/overview-tree.html
	javadoc/serialized-form.html
Merged, for real this time...

Something weird happened with the HTTPRequest file, a >>>>>>> line was left in
place... It said it hadn't been changed... Weird things. Really weird
things...

Never mind. It's been there since 9c12fca8, when Michael merged
something. All his fault. All his fault...