Merge branch 'master' into moderation

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index ce2b4f11483c631b4c7984fb2a5fdb9f09d18f61,b65ec4ed9706fc79e552a0b9a4aa859931275967..d67d34d4723d4a670c57f156350b966e8e0998af
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,22 -2,21 +2,22 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
-     actioncable (5.0.5)
-       actionpack (= 5.0.5)
-       nio4r (>= 1.2, < 3.0)
 +    aasm (4.1.0)
+     actioncable (5.1.4)
+       actionpack (= 5.1.4)
+       nio4r (~> 2.0)
        websocket-driver (~> 0.6.1)
-     actionmailer (5.0.5)
-       actionpack (= 5.0.5)
-       actionview (= 5.0.5)
-       activejob (= 5.0.5)
+     actionmailer (5.1.4)
+       actionpack (= 5.1.4)
+       actionview (= 5.1.4)
+       activejob (= 5.1.4)
        mail (~> 2.5, >= 2.5.4)
        rails-dom-testing (~> 2.0)
-     actionpack (5.0.5)
-       actionview (= 5.0.5)
-       activesupport (= 5.0.5)
+     actionpack (5.1.4)
+       actionview (= 5.1.4)
+       activesupport (= 5.1.4)
        rack (~> 2.0)
-       rack-test (~> 0.6.3)
+       rack-test (>= 0.6.3)
        rails-dom-testing (~> 2.0)
        rails-html-sanitizer (~> 1.0, >= 1.0.2)
      actionpack-page_caching (1.1.0)
@@@ -156,23 -159,10 +160,24 @@@
        mime-types-data (~> 3.2015)
      mime-types-data (3.2016.0521)
      mimemagic (0.3.0)
-     mini_portile2 (2.2.0)
+     mini_mime (0.1.4)
+     mini_portile2 (2.3.0)
      minitest (5.10.3)
-     multi_json (1.12.1)
 +    minitest-capybara (0.8.2)
 +      capybara (~> 2.2)
 +      minitest (~> 5.0)
 +      rake
 +    minitest-metadata (0.6.0)
 +      minitest (>= 4.7, < 6.0)
 +    minitest-rails (3.0.0)
 +      minitest (~> 5.8)
 +      railties (~> 5.0)
 +    minitest-rails-capybara (3.0.1)
 +      capybara (~> 2.7)
 +      minitest-capybara (~> 0.8)
 +      minitest-metadata (~> 0.6)
 +      minitest-rails (~> 3.0)
+     multi_json (1.12.2)
      multi_xml (0.6.0)
      multipart-post (2.0.0)
      nio4r (2.1.0)
@@@ -363,8 -355,8 +370,9 @@@ PLATFORM
  
  DEPENDENCIES
    SystemTimer (>= 1.1.3)
 +  aasm
    actionpack-page_caching
+   annotate
    autoprefixer-rails
    bigdecimal (~> 1.1.0)
    canonical-rails

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

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

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

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

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

diff --cc config/routes.rb
Simple merge

diff --cc test/test_helper.rb
Simple merge