Merge 9379586fad into 4089f16f17

Gemfile.lock

@@ -115,7 +115,6 @@ GEM
     cloudinary (1.1.6)
       aws_cf_signer
       rest-client
-    cocoon (1.2.6)
     coderay (1.1.0)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
@@ -361,15 +360,15 @@ GEM
       rails-assets-bootstrap (~> 3)
     rails-assets-date.format (1.2.3)
     rails-assets-holderjs (2.9.3)
-    rails-assets-jquery (2.2.1)
+    rails-assets-jquery (2.2.4)
     rails-assets-jquery-smooth-scroll (1.7.2)
       rails-assets-jquery (>= 1.4.2)
     rails-assets-markdown (0.5.0)
-    rails-assets-momentjs (2.11.2)
+    rails-assets-momentjs (2.13.0)
     rails-assets-spectrum (1.8.0)
       rails-assets-jquery (>= 1.7.2)
     rails-assets-tinycolor (1.3.0)
-    rails-assets-to-markdown (1.3.0)
+    rails-assets-to-markdown (3.0.0)
     rails-assets-trianglify (0.4.0)
     rails-assets-waypoints (4.0.0)
     rails-deprecated_sanitizer (1.0.3)
@@ -555,7 +554,6 @@ DEPENDENCIES
   carrierwave-bombshelter
   chart-js-rails
   cloudinary
-  cocoon
   country_select
   coveralls
   daemons
@@ -633,6 +631,3 @@ DEPENDENCIES
   web-console (~> 2.0)
   webmock
   whenever
-
-BUNDLED WITH
-   1.12.5