Merge branch 'master' into disable_rfcs

# Conflicts:
#	app/assets/stylesheets/editor.css.scss

app/views/application/_flash.html.slim

@@ -1,5 +1,6 @@
-#flash.fixed_error_messages data-message-failure=t('shared.message_failure')
-  - %w[alert danger info notice success warning].each do |severity|
-    div.alert.flash class="alert-#{{'alert' => 'warning', 'notice' => 'success'}.fetch(severity, severity)}"
-      p id="flash-#{severity}" = flash[severity]
-      span.fa.fa-times
+#flash-container
+  #flash.container.fixed_error_messages data-message-failure=t('shared.message_failure')
+    - %w[alert danger info notice success warning].each do |severity|
+      div.alert.flash class="alert-#{{'alert' => 'warning', 'notice' => 'success'}.fetch(severity, severity)}"
+        p id="flash-#{severity}" = flash[severity]
+        span.fa.fa-times

app/views/layouts/application.html.slim

@@ -32,8 +32,8 @@ html lang='en'
             li = link_to(t('shared.help.link'), '#modal-help', data: {toggle: 'modal'})
             = render('session')
     .container data-controller=controller_name
-      = render('breadcrumbs')
       = render('flash')
+      = render('breadcrumbs')
     - if (controller_name == "exercises" && action_name == "implement")
       .container-fluid
         = yield

app/views/sessions/destroy_through_lti.html.slim

@@ -10,7 +10,7 @@ h2 = t('shared.statistics')
 = row(label: '.score') do
   p == t('shared.out_of', maximum_value: @submission.exercise.maximum_score, value: @submission.score)
   p = progress_bar(@submission.percentage)
-= row(label: '.final_submissions', value: @submission.exercise.submissions.final.distinct.count(:user_id, :user_type) - 1)
+/= row(label: '.final_submissions', value: @submission.exercise.submissions.final.distinct.count(:user_id, :user_type) - 1)
 /= row(label: '.average_score') do
 /  p == t('shared.out_of', maximum_value: @submission.exercise.maximum_score, value: @submission.exercise.average_score.round(2))
 /  p = progress_bar(@submission.exercise.average_percentage)