Merge remote-tracking branch 'origin/master'

app/client/client.js

@@ -146,6 +146,11 @@ Template.admin.helpers({
       });
       return Session.get("userNum");
   },
+    roomUserNum: function(){
+        var type = this.type;
+        var userNum = Rooms.findOne({type: type}).users;
+        return userNum;
+    },
   allUsers: function(){
       Meteor.call("getTotalUsers", function(err, num){
           Session.set("allUsers", num);

app/client/templates/admin.html

@@ -19,7 +19,7 @@
                   </tr>
                   <tr>
                     <td>{{songs.length}}</td>
-                    <td></td>
+                    <td>{{roomUserNum}}</td>
                     <td></td>
                     <td>{{reportsCount display}}</td>
                     <td>{{queueCount display}}</td>