Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

gulpfile.js

@@ -126,7 +126,7 @@ gulp.task('serve', function(cb) {
     script: paths.server,
     ext: '.js .json',
     ignore: paths.serverIgnore,
-    exec: './node_modules/.bin/babel-node',
+    exec: path.join(__dirname, 'node_modules/.bin/babel-node'),
     env: {
       'NODE_ENV': 'development',
       'DEBUG': process.env.DEBUG || 'freecc:*'

server/views/coursewares/showBonfire.jade

@@ -100,6 +100,7 @@ block content
                         i.fa.fa-bug
                             |   Bug
                 .button-spacer
+
                 form.code
                     .form-group.codeMirrorView
                         textarea#codeOutput(style='display: none;')
@@ -117,11 +118,12 @@ block content
                     var dashed = !{JSON.stringify(dashedName)};
 
         .col-xs-12.col-sm-12.col-md-8
-            #mainEditorPanel
-                form.code
-                    .form-group.codeMirrorView
-                        textarea#codeEditor(autofocus=true, style='display: none;')
-                script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js')
+            .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
+                #mainEditorPanel
+                    form.code
+                        .form-group.codeMirrorView
+                            textarea#codeEditor(autofocus=true, style='display: none;')
+                    script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js')
 
     #complete-courseware-dialog.modal(tabindex='-1')
         .modal-dialog.animated.zoomIn.fast-animation

server/views/coursewares/showHTML.jade

@@ -65,11 +65,11 @@ block content
                     var challengeType = !{JSON.stringify(challengeType)};
                     var started = Math.floor(Date.now());
         .col-xs-12.col-sm-12.col-md-5.col-lg-6
-            .editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;")
-                #mainEditorPanel
-                    form.code
-                        .form-group.codeMirrorView
-                            textarea#codeEditor(autofocus=true, style='display: none;')
+            .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
+                    #mainEditorPanel
+                        form.code
+                            .codeMirrorView
+                                textarea#codeEditor(autofocus=true, style='display: none;')
         .col-md-4.col-lg-3
             .hidden-xs.hidden-sm
                 img.iphone-position.iframe-scroll(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png")

server/views/coursewares/showJS.jade

@@ -66,7 +66,7 @@ block content
                     var _ = R;
                     var dashed = !{JSON.stringify(dashedName)};
         .col-xs-12.col-sm-12.col-md-8
-            .editorScrollDiv(style = "overflow-y: scroll; overflow-x: hidden;")
+            .editorScrollDiv(style = "overflow-y: auto; overflow-x: hidden;")
                 #mainEditorPanel
                     form.code
                         .codeMirrorView