Merge branch 'master' into koishi

roomlist.js

-// Generated by CoffeeScript 2.5.1
+// Generated by CoffeeScript 2.6.1
 (function() {
   var WebSocketServer, _delete, broadcast, create, init, room_data, server, settings, start, update, url;
 
@@ -40,9 +40,9 @@
     server = new WebSocketServer({
       server: http_server
     });
-    return server.on('connection', function(connection) {
+    return server.on('connection', function(connection, upgradeReq) {
       var room;
-      connection.filter = url.parse(connection.upgradeReq.url, true).query.filter || 'waiting';
+      connection.filter = url.parse(upgradeReq.url, true).query.filter || 'waiting';
       return connection.send(JSON.stringify({
         event: 'init',
         data: (function() {