Merge remote-tracking branch 'origin/master' into flowr

# Conflicts:
#	app/assets/javascripts/editor/evaluation.js
#	app/assets/javascripts/editor/participantsupport.js
#	app/views/exercises/_editor_output.html.slim
#	config/code_ocean.yml.example
#	config/routes.rb

config/routes.rb

@@ -28,7 +28,7 @@ Rails.application.routes.draw do
   delete '/comment_by_id', to: 'comments#destroy_by_id'
   put '/comments', to: 'comments#update'
 
-  resources :subscriptions do
+  resources :subscriptions, only: [:create, :destroy] do
     member do
       get :unsubscribe, to: 'subscriptions#destroy'
     end
@@ -67,7 +67,7 @@ Rails.application.routes.draw do
       get :statistics
     end
 
-    resources :errors, only: [:create, :index, :show]
+    resources :errors, only: [:create, :index, :show], controller: 'code_ocean/errors'
     resources :hints
   end