got rid of separate namespaces for sockets
fix merge conflicts
added poll for server info in index.html