Merge branch 'develop' into 0valt/csrf

Author: Oaphi

Gemfile.lock

@@ -344,7 +344,7 @@ GEM
       railties (>= 5.2)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.4.1)
+    rexml (3.4.2)
     rmagick (5.5.0)
       observer (~> 0.1)
       pkg-config (~> 1.4)