Merge branch 'master' of https://github.com/codecombat/codecombat

app/styles/play/level/tome/spell.sass

@@ -97,5 +97,6 @@
       border-bottom: 1px dotted rgba(255, 128, 128, 0.45)
 
     .ace_text-layer .ace_comment
-      color: darken(rgb(76, 136, 107), 5%)
+      color: darken(rgb(103, 164, 200), 5%)
+
       

app/views/play/level_view.coffee

@@ -64,6 +64,9 @@ module.exports = class PlayLevelView extends View
   events:
     'click #level-done-button': 'onDonePressed'
 
+  shortcuts:
+    'ctrl+s': 'onCtrlS'
+
   constructor: (options, @levelID) ->
     console.profile?() if PROFILE_ME
     super options
@@ -189,6 +192,9 @@ module.exports = class PlayLevelView extends View
 
   # callbacks
 
+  onCtrlS: (e) ->
+    e.preventDefault()
+
   onLevelReloadFromData: (e) ->
     isReload = Boolean @world
     @setLevel e.level, e.supermodel