Merge 7daf7f8 into f7a840c

Gemfile.lock

@@ -79,6 +79,7 @@ GEM
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+    crass (1.0.5)
     datetime_picker_rails (0.0.5)
       momentjs-rails (>= 2.8.1)
     debug_inspector (0.0.2)
@@ -126,12 +127,13 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.10.0)
-    loofah (2.0.3)
+    loofah (2.3.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.6.2)
-    mini_portile (0.6.2)
+    mini_portile2 (2.1.0)
     minitest (5.8.2)
     momentjs-rails (2.10.6)
       railties (>= 3.1)
@@ -142,8 +144,8 @@ GEM
       bourbon (>= 4.0)
       sass (>= 3.3)
     netrc (0.11.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
     normalize-rails (3.0.3)
     oauth (0.4.7)
     oauth2 (1.0.0)