Update version
GW testing websocket server
Updated from master