Merge branch 'master' into moderation

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 60147782433e02fbce53c5f5d20072f80679f027,bbfb73c5a6e67f604d2ae177ba56b6750c5143d3..02bb3e5fdbeaf3634243e6ca46721cdddf7caaa2
--- 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.1.4)
-       actionpack (= 5.1.4)
 +    aasm (4.1.0)
+     actioncable (5.1.5)
+       actionpack (= 5.1.5)
        nio4r (~> 2.0)
        websocket-driver (~> 0.6.1)
-     actionmailer (5.1.4)
-       actionpack (= 5.1.4)
-       actionview (= 5.1.4)
-       activejob (= 5.1.4)
+     actionmailer (5.1.5)
+       actionpack (= 5.1.5)
+       actionview (= 5.1.5)
+       activejob (= 5.1.5)
        mail (~> 2.5, >= 2.5.4)
        rails-dom-testing (~> 2.0)
-     actionpack (5.1.4)
-       actionview (= 5.1.4)
-       activesupport (= 5.1.4)
+     actionpack (5.1.5)
+       actionview (= 5.1.5)
+       activesupport (= 5.1.5)
        rack (~> 2.0)
        rack-test (>= 0.6.3)
        rails-dom-testing (~> 2.0)

diff --cc app/assets/stylesheets/common.scss
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
Simple merge