Committing updated webserver
Merge branch 'master' of https://github.com/kapilsukhyani/networklogger

Conflicts:
	src/com/enlighten/transparentproxy/webserver/WebServer.java