Merge remote-tracking branch 'origin/master' into error-info

# Conflicts:
#	app/controllers/concerns/submission_scoring.rb
#	app/views/application/_navigation.html.slim
#	config/locales/de.yml
#	config/locales/en.yml
#	db/schema.rb

test/controllers/exercise_collections_controller_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class ExerciseCollectionsControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+  end
+
+  test "should get show" do
+    get :show
+    assert_response :success
+  end
+
+end

test/controllers/subscription_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SubscriptionControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/factories/subscriptions.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :subscription do
+    user nil
+    request_for_comments nil
+    type ""
+  end
+end

test/models/subscription_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SubscriptionTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end