Rebase on Master with Netty 4 support
WebSockets support