diff --git a/Gemfile b/Gemfile
index 2ed8bf26f..b4366b551 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.17'
+gem 'rails', '3.2.18'
 
 # Appserver
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 186e579f5..49be46e1b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.17)
-      actionpack (= 3.2.17)
+    actionmailer (3.2.18)
+      actionpack (= 3.2.18)
       mail (~> 2.5.4)
-    actionpack (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -14,20 +14,20 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-import (0.3.1)
       activerecord (~> 3.0)
-    activeresource (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-    activesupport (3.2.17)
+    activeresource (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+    activesupport (3.2.18)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.4.1)
@@ -239,7 +239,7 @@ GEM
     mobile-fu (1.2.2)
       rack-mobile-detect
       rails
-    multi_json (1.8.4)
+    multi_json (1.10.0)
     multi_test (0.0.3)
     multipart-post (1.2.0)
     mysql2 (0.3.14)
@@ -304,14 +304,14 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.17)
-      actionmailer (= 3.2.17)
-      actionpack (= 3.2.17)
-      activerecord (= 3.2.17)
-      activeresource (= 3.2.17)
-      activesupport (= 3.2.17)
+    rails (3.2.18)
+      actionmailer (= 3.2.18)
+      actionpack (= 3.2.18)
+      activerecord (= 3.2.18)
+      activeresource (= 3.2.18)
+      activesupport (= 3.2.18)
       bundler (~> 1.0)
-      railties (= 3.2.17)
+      railties (= 3.2.18)
     rails-i18n (0.7.4)
       i18n (~> 0.5)
     rails-timeago (2.4.0)
@@ -334,15 +334,15 @@ GEM
       sass-rails (~> 3.1)
     rails_autolink (1.1.5)
       rails (> 3.1)
-    railties (3.2.17)
-      actionpack (= 3.2.17)
-      activesupport (= 3.2.17)
+    railties (3.2.18)
+      actionpack (= 3.2.18)
+      activesupport (= 3.2.18)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.12.0)
-    rake (10.1.1)
+    rake (10.3.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
     rdoc (3.12.2)
@@ -414,7 +414,7 @@ GEM
     subexec (0.2.3)
     systemu (2.5.2)
     test_after_commit (0.2.2)
-    thor (0.18.1)
+    thor (0.19.1)
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
@@ -429,7 +429,7 @@ GEM
       simple_oauth (~> 0.2)
     typhoeus (0.6.7)
       ethon (~> 0.6.2)
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -509,7 +509,7 @@ DEPENDENCIES
   rack-protection (= 1.2)
   rack-rewrite (= 1.5.0)
   rack-ssl (= 1.3.3)
-  rails (= 3.2.17)
+  rails (= 3.2.18)
   rails-i18n (= 0.7.4)
   rails-timeago
   rails_admin (= 0.4.9)