Merge branch 'master' into production

app/lib/Angel.coffee

@@ -151,7 +151,7 @@ module.exports = class Angel extends CocoClass
     if @work?.indefiniteLength and world.victory?
       finished = true
       world.totalFrames = world.frames.length
-    firstChangedFrame = if @work.indefiniteLength then 0 else world.findFirstChangedFrame @shared.world
+    firstChangedFrame = if @work?.indefiniteLength then 0 else world.findFirstChangedFrame @shared.world
     eventType = if finished then 'new-world-created' else 'streaming-world-updated'
     if finished
       @shared.world = world

app/styles/courses/teacher-dashboard-nav.sass

@@ -11,7 +11,6 @@
     background: $navy
     
     .navbar-toggle
-      margin-top: 
       border-color: white
       
     .icon-bar
@@ -43,4 +42,3 @@
         margin-right: 0.6em
         border-bottom: 4px solid white
         border-radius: 0
-    

app/styles/style-flat.sass

@@ -119,6 +119,10 @@ body[lang='ru'], body[lang='uk'], body[lang='bg'], body[lang^='mk'], body[lang='
     .navbar-toggle
       color: black
       margin: 30px 25px 0
+      border-color: $navy
+
+      .icon-bar
+        background-color: $navy
       
     @media (min-width: $screen-lg-min)
       #navbar-collapse

app/views/play/level/LevelLoadingView.coffee

@@ -61,7 +61,7 @@ module.exports = class LevelLoadingView extends CocoView
     for goalID, goal of @level.get('goals') when (not goal.team or goal.team is (e.team or 'humans')) and not goal.hiddenGoal
       continue if goal.optional and @level.isType('course')
       name = utils.i18n goal, 'name'
-      goalList.append $('<li>' + name + '</li>')
+      goalList.append $('<li>').text(name)
       ++goalCount
     if goalCount
       goalContainer.removeClass('secret')