Merge remote-tracking branch 'origin/master'

Conflicts:
	app/client/app.css
	app/client/client.js

app/client/app.css

@@ -684,8 +684,9 @@ footer .fa {
 }
 
 .station > h3 {
-    line-height: 200px;
+    line-height: 0px;
     font-size: 42px;
+    margin-bottom: 90px;
 }
 
 .station > h5 {
@@ -1562,6 +1563,11 @@ input[type="checkbox"]:checked + #two-label:after {
     display: block;
 }
 
+.user-num{
+    font-size: 2em !important;
+    line-height: 100px;
+}
+
 .remove-import-song {
     position: absolute;
     right: 0px;

app/client/client.js

@@ -480,6 +480,11 @@ Template.dashboard.helpers({
         } else {
             return {};
         }
+    },
+    userNum: function(){
+        var type = this.type;
+        var userNum = Rooms.findOne({type: type}).users;
+        return userNum;
     }
 });
 
@@ -1041,11 +1046,17 @@ Template.room.events({
     "change #si_or_pl": function(){
         if($("#select_playlist").is(':selected')){
             $("#search-info").hide();
-            $("#playlist-import").show();
-        } else{
+            $("#playlist-buttons").show();
+        }
+        if($("#select_single").is(':selected')){
             $("#search-info").show();
-            $("#playlist-import").hide();
+            $("#playlist-buttons").hide();
         }
+    },
+    "click #close-modal-a": function(){
+        $("#select_single").attr("selected", true);
+        $("#search-info").show();
+        $("#playlist-buttons").hide();
     }
 });
 

app/client/templates/dashboard.html

@@ -17,10 +17,13 @@
             {{else}}
                 <div class="col-md-4 col-sm-6 col-xs-12">
                     <div class="station">
+                        {{#with type=type}}
+                            <i class="fa fa-user user-num"></i> <span class="user-num">{{userNum}}</span>
+                        {{/with}}
                         <h3>{{display}}</h3>
                         {{#with type=type}}
-                        <h5>{{currentSong.song.title}}</h5>
-                        <h6>{{currentSong.song.artist}}</h6>
+                            <h5>{{currentSong.song.title}}</h5>
+                            <h6>{{currentSong.song.artist}}</h6>
                         {{/with}}
                         <a href="/{{type}}" class="station_link"></a>
                     </div>