Merge branch 'master' into rt/comments

Conflicts:
	app/assets/javascripts/editor.js

app/controllers/concerns/submission_scoring.rb

@@ -26,8 +26,14 @@ module SubmissionScoring
 
   def score_submission(submission)
     outputs = collect_test_results(submission)
-    score = outputs.map { |output|
-      output[:score] * output[:weight] }.reduce(:+)
+    score = 0.0
+    if not (outputs.nil? || outputs.empty?)
+      outputs.each do |output|
+        if not output.nil?
+          score += output[:score] * output[:weight]
+        end
+      end
+    end
     submission.update(score: score)
     outputs
   end

app/controllers/submissions_controller.rb

@@ -56,7 +56,7 @@ class SubmissionsController < ApplicationController
   end
 
   def index
-    @search = Submission.last(100).search(params[:q])
+    @search = Submission.search(params[:q])
     @submissions = @search.result.includes(:exercise, :user).paginate(page: params[:page])
     authorize!
   end