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

db/migrate/20170830083601_add_cause_to_testruns.rb

@@ -0,0 +1,18 @@
+class AddCauseToTestruns < ActiveRecord::Migration
+  def up
+    add_column :testruns, :cause, :string
+    Testrun.reset_column_information
+    Testrun.all.each{ |testrun|
+      if(testrun.submission.nil?)
+        say_with_time "#{testrun.id} has no submission" do end
+      else
+        testrun.cause = testrun.submission.cause
+        testrun.save
+      end
+    }
+  end
+
+  def down
+    remove_column :testruns, :cause
+  end
+end

db/migrate/20170906124500_create_subscriptions.rb

@@ -0,0 +1,11 @@
+class CreateSubscriptions < ActiveRecord::Migration
+  def change
+    create_table :subscriptions do |t|
+      t.belongs_to :user, polymorphic: true
+      t.references :request_for_comment
+      t.string :type
+
+      t.timestamps null: false
+    end
+  end
+end

db/migrate/20170913054203_rename_subscription_type.rb

@@ -0,0 +1,5 @@
+class RenameSubscriptionType < ActiveRecord::Migration
+  def change
+    rename_column :subscriptions, :type, :subscription_type
+  end
+end

db/migrate/20170920145852_add_deleted_to_subscription.rb

@@ -0,0 +1,5 @@
+class AddDeletedToSubscription < ActiveRecord::Migration
+  def change
+    add_column :subscriptions, :deleted, :boolean
+  end
+end