Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection

# Conflicts:
#	db/schema.rb

config/locales/en.yml

@@ -41,7 +41,6 @@ en:
         allow_auto_completion: "Allow auto completion"
         allow_file_creation: "Allow file creation"
         difficulty: Difficulty
-        worktime: "Expected worktime in minutes"
         token: "Exercise Token"
       proxy_exercise:
         title: Title
@@ -128,6 +127,10 @@ en:
         use_anomaly_detection: "Enable Worktime Anomaly Detection"
         updated_at: "Last Update"
         exercises: "Exercises"
+      user_exercise_feedback:
+        user: "Author"
+        exercise: "Exercise"
+        feedback_text: "Feedback Text"
     models:
       code_harbor_link:
         one: CodeHarbor Link
@@ -692,6 +695,7 @@ en:
     estimated_time_20_to_30: "between 20 and 30 minutes"
     estimated_time_more_30: "more than 30 minutes"
     working_time: "Estimated time working on this exercise:"
+    no_feedback: "There is no feedback for this exercise yet."
   error_templates:
     hints:
       signature: "A regular expression in Ruby syntax without leading and trailing \"/\""