Merge branch 'master' into moderation

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index f25e2e7f0623ae134fdcb97fc61c21685da4847d,f73d4a5d8b578ba4ce393d4ff5e8a8a05c3433e5..0dcd5bd24b3ddd1021821dd0c1e1f427d402b98f
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,20 -2,19 +2,20 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
-     actioncable (5.0.4)
-       actionpack (= 5.0.4)
 +    aasm (4.1.0)
+     actioncable (5.0.5)
+       actionpack (= 5.0.5)
        nio4r (>= 1.2, < 3.0)
        websocket-driver (~> 0.6.1)
-     actionmailer (5.0.4)
-       actionpack (= 5.0.4)
-       actionview (= 5.0.4)
-       activejob (= 5.0.4)
+     actionmailer (5.0.5)
+       actionpack (= 5.0.5)
+       actionview (= 5.0.5)
+       activejob (= 5.0.5)
        mail (~> 2.5, >= 2.5.4)
        rails-dom-testing (~> 2.0)
-     actionpack (5.0.4)
-       actionview (= 5.0.4)
-       activesupport (= 5.0.4)
+     actionpack (5.0.5)
+       actionview (= 5.0.5)
+       activesupport (= 5.0.5)
        rack (~> 2.0)
        rack-test (~> 0.6.3)
        rails-dom-testing (~> 2.0)

diff --cc app/controllers/diary_entry_controller.rb
Simple merge

diff --cc app/views/browse/changeset.html.erb
Simple merge

diff --cc app/views/diary_entry/view.html.erb
Simple merge

diff --cc app/views/layouts/_header.html.erb
Simple merge

diff --cc app/views/user/view.html.erb
Simple merge