Merge pull request #423 from codecombat/master

Merged master into production

app/lib/surface/CoordinateDisplay.coffee

@@ -55,7 +55,7 @@ module.exports = class CoordinateDisplay extends createjs.Container
     @label.regY = height / 2
     sup = @camera.worldToSurface @lastPos
     @x = sup.x
-    @y = sup.y
+    @y = sup.y - 7
     @addChild @label
     @cache -width / 2, -height / 2, width, height
     Backbone.Mediator.publish 'surface:coordinates-shown', {}

app/views/play/level/hud_view.coffee

@@ -66,8 +66,9 @@ module.exports = class HUDView extends View
     @clearSpeaker()
 
   onNewWorld: (e) ->
+    hadThang = @thang
     @thang = e.world.thangMap[@thang.id] if @thang
-    if not @thang
+    if hadThang and not @thang
       @setThang null, null
 
   setThang: (thang, thangType) ->

package.json

@@ -69,7 +69,7 @@
     "javascript-brunch": "> 1.0 < 1.8",
     "coffee-script-brunch": "https://github.com/brunch/coffee-script-brunch/tarball/master",
     "coffeelint-brunch": "> 1.0 < 1.8",
-    "sass-brunch": "~1.8.0",
+    "sass-brunch": "1.7.0",
     "css-brunch": "> 1.0 < 1.8",
     "jade-brunch": "> 1.0 < 1.8",
     "uglify-js-brunch": "~1.7.4",