Merge branch 'master' into production

app/locale/en.coffee

@@ -437,7 +437,6 @@
     done: "Done"
     next_level: "Next Level"
     next_game: "Next game"
-    programming_language: "Programming language"
     show_menu: "Show game menu"
     home: "Home"  # Not used any more, will be removed soon.
     level: "Level"  # Like "Level: Dungeons of Kithgard"

app/styles/play/level/tome/spell-top-bar-view.sass

@@ -2,8 +2,7 @@
 @import "app/styles/bootstrap/variables"
 
 #spell-top-bar-view
-  $control-yellow-highlight: rgb(243, 211, 59)
-  $height: 107px
+  $height: 87px
   $paddingTop: 10px
   $paddingBottom: 25px
   $childSize: $height - $paddingTop - $paddingBottom
@@ -51,24 +50,10 @@
     float: left
     margin-top: 5px
 
-  .programming-language-container
-    position: absolute
-    padding-top: $paddingTop
-    right: 20px
-    font-family: "Open Sans Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif
-    .programming-language-label
-      color: $control-yellow-highlight
-      font-size: 12px
-      font-weight: bold
-      text-transform: uppercase
-    .programming-language
-      color: white
-      font-size: 16px
-
   .spell-tool-buttons
     position: absolute
     right: 0px
-    top: 30px
+    top: 0px
 
   .reload-code
     float: right

app/templates/play/level/tome/spell-top-bar-view.jade

@@ -35,13 +35,3 @@
         span(data-i18n='sharing.webpage')
 
   .clearfix
-
-.programming-language-container
-  span.programming-language-label(data-i18n='play_level.programming_language')
-  span.programming-language-label.spr :
-  if view.spell.language === 'html' || view.spell.language === 'javascript'
-    span.programming-language JavaScript
-  else if view.spell.language === 'python'
-    span.programming-language Python
-  else
-    span.programming-language= view.spell.language

app/views/play/level/tome/SpellTopBarView.coffee

@@ -39,6 +39,7 @@ module.exports = class SpellTopBarView extends CocoView
 
   afterRender: ->
     super()
+    @$el.addClass 'spell-tab'
     @attachTransitionEventListener()
 
   onDisableControls: (e) -> @toggleControls e, false

bower.json

@@ -38,7 +38,6 @@
     "jsondiffpatch": "0.1.8",
     "nanoscroller": "~0.8.0",
     "treema": "https://github.com/codecombat/treema.git#master",
-    "jquery.tablesorter": "~2",
     "bootstrap": "~3.2.0",
     "validated-backbone-mediator": "~0.1.3",
     "jquery.browser": "~0.0.6",
@@ -85,13 +84,6 @@
         "treema-utils.js"
       ]
     },
-    "jquery.tablesorter": {
-      "main": [
-        "js/jquery.tablesorter.js",
-        "js/jquery.tablesorter.widgets.js",
-        "css/theme.bootstrap.css"
-      ]
-    },
     "bootstrap": {
       "main": [
         "./dist/js/bootstrap.js",