Merge branch 'master' into add_roles_via_LTI

# Conflicts:
#	app/views/application/_breadcrumbs.html.slim
#	app/views/application/welcome.html.slim
#	app/views/exercise_collections/show.html.slim
#	app/views/external_users/index.html.slim
#	app/views/layouts/application.html.slim
#	app/views/proxy_exercises/index.html.slim
#	app/views/user_exercise_feedbacks/index.html.slim
#	app/views/user_mailer/send_thank_you_note.slim

config/locales/de.yml

@@ -301,7 +301,7 @@ de:
       file: 'Test-Datei <span class="number">%{number}</span> (<span class="filename">%{filename}</span>)'
       hint: Tipp
       no_files: Die Aufgabe umfasst noch keine sichtbaren Dateien.
-      no_output: Die letzte Code-Ausführung hat keine Ausgabe erzeugt.
+      no_output: Die letzte Code-Ausführung terminierte am %{timestamp} ohne Ausgabe.
       no_output_yet: Bisher existiert noch keine Ausgabe.
       output: Programm-Ausgabe
       passed_tests: Erfolgreiche Tests

config/locales/en.yml

@@ -301,7 +301,7 @@ en:
       file: 'Test File <span class="number">%{number}</span> (<span class="filename">%{filename}</span>)'
       hint: Hint
       no_files: The exercise does not comprise visible files yet.
-      no_output: The last code run has not generated any output.
+      no_output: The last code run finished on %{timestamp} without any output.
       no_output_yet: There is no output yet.
       output: Program Output
       passed_tests: Passed Tests

config/routes.rb

@@ -150,7 +150,7 @@ Rails.application.routes.draw do
   post '/lti/launch', as: 'lti_launch', to: 'sessions#create_through_lti'
   get '/lti/return', as: 'lti_return', to: 'sessions#destroy_through_lti'
   get '/sign_in', as: 'sign_in', to: 'sessions#new'
-  delete '/sign_out', as: 'sign_out', to: 'sessions#destroy'
+  match '/sign_out', as: 'sign_out', to: 'sessions#destroy', via: [:get, :delete]
 
   resources :submissions, only: [:create, :index, :show] do
     member do