Merge branch master into i18n

Gemfile.lock

@@ -18,15 +18,6 @@ GIT
     acts_as_versioned (0.6.0)
       activerecord (>= 3.0.9)
 
-PATH
-  remote: ../../common_deploy
-  specs:
-    common_deploy (0.0.1)
-      capistrano (>= 2.13.5)
-      capistrano-ext
-      capistrano-resque (~> 0.1.0)
-      rvm-capistrano
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -76,10 +67,6 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
-    capistrano-resque (0.1.0)
-      capistrano
-      resque
-      resque-scheduler
     chronic (0.9.0)
     client_side_validations (3.1.4)
     coderay (1.0.8)
@@ -93,7 +80,7 @@ GEM
     commonjs (0.2.6)
     daemons (1.1.9)
     erubis (2.7.0)
-    eventmachine (1.0.0)
+    eventmachine (1.0.3)
     exception_notification (2.6.1)
       actionmailer (>= 3.0.4)
     execjs (1.4.0)
@@ -208,16 +195,8 @@ GEM
       redis-namespace (~> 1.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque-scheduler (2.0.1)
-      redis (>= 2.0.1)
-      resque (>= 1.20.0)
-      rufus-scheduler
     ruby-prof (0.11.2)
     ruby-rc4 (0.1.5)
-    rufus-scheduler (2.0.19)
-      tzinfo (>= 0.3.23)
-    rvm-capistrano (1.3.0)
-      capistrano (>= 2.0.0)
     sass (3.2.1)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
@@ -289,7 +268,6 @@ DEPENDENCIES
   capistrano-ext
   client_side_validations
   coffee-rails (~> 3.2.1)
-  common_deploy!
   daemons
   exception_notification
   haml-rails
@@ -313,6 +291,7 @@ DEPENDENCIES
   sqlite3
   test-unit
   therubyracer
+  thin
   twitter-bootstrap-rails
   uglifier (>= 1.0.3)
   whenever