Merge branch 'master' into production

app/styles/courses/classroom-view.sass

@@ -1,18 +1,22 @@
 #classroom-view
 
-  .enable-btn
-    margin-top: 1px
-    margin-bottom: 4px
+  hr
+    margin-top: 5px
+    margin-bottom: 10px
 
   #main-button-area
     .btn
       margin-left: 10px
 
   #student-stats-row
-    margin-bottom: 20px
+    margin-bottom: 10px
+
+  .student-name
+    font-size: 20px
+    font-weight: bold
 
   .progress
-    margin-bottom: 5px
+    margin-bottom: 2px
 
   .progress-bar
     border-right: 1px solid grey

app/templates/courses/classroom-view.jade

@@ -53,12 +53,14 @@ block content
     hr
     
     for user in view.users.models
-      if view.teacherMode
-        a.remove-student-link.pull-right.text-uppercase(data-user-id=user.id)
-          span.glyphicon.glyphicon-remove
-          span.spl remove student
-      
-      h2= user.broadName()
+      .row
+        .col-md-6
+          .student-name= user.broadName() || 'Anoner'
+        .col-md-6
+          if view.teacherMode
+            a.remove-student-link.pull-right.text-uppercase(data-user-id=user.id)
+              span.glyphicon.glyphicon-remove
+              span.spl remove student
       - var lastPlayedString = view.userLastPlayedString(user);
       - var playtime = view.userPlaytimeString(user);
       if lastPlayedString || playtime