Get my fork to come more in line with upstream (given that it now
supports the interfaces work from my fork)

Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/example/ChatClient.java
	src/main/java/org/java_websocket/WebSocket.java
	src/main/java/org/java_websocket/WebSocketAdapter.java
	src/main/java/org/java_websocket/WebSocketListener.java
	src/main/java/org/java_websocket/client/WebSocketClient.java
	src/main/java/org/java_websocket/server/WebSocketServer.java
* Merge branch 'master' of https://github.com/0x6a77/Java-WebSocket.git

* Add debugging and better handle exceptions thrown in SSL sockets.