add gevent and socket.io
fix merge conflictd