Merge "Hooking up GUI server & client via web-socket."