update with changes from Production branch

Gemfile

@@ -1,18 +1,61 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.1'
+gem 'rails', '4.0.2'
+gem 'jquery-rails', '3.0.4'
+gem 'rails_autolink'
 gem 'mysql2'
 gem 'authlogic'
-gem 'jquery-rails', '2.0.1'
+gem 'twitter_oauth', git: 'git://github.com/moomerman/twitter_oauth.git'
+gem 'therubyracer'
+gem 'exception_notification'
+gem 'nested_form'
+gem 'dalli'
+gem 'kgio'
+gem 'will_paginate', '~> 3.0.pre2'
+gem 'nokogiri'
+gem 'acts_as_tree'
+gem 'acts_as_list'
+gem 'gravatarify'
+gem 'dynamic_form'
+gem 'geokit'
+gem 'redis'
+gem 'resque-scheduler', '2.3.1', :require => 'resque_scheduler'
+gem 'resque-timeout'
+gem 'daemons'
+#gem 'db2fog' (not compatible with Rails 4, see https://github.com/hakanensari/db2fog for Rails 4 version)
+gem 'simplificator-rwebthumb', :git => "git://github.com/simplificator/rwebthumb.git"
+gem 'tweetstream'
+gem 'capistrano', '~> 2.15.4'
+gem 'rack-utf8_sanitizer'
+gem 'newrelic_rpm'
+gem 'actionpack-xml_parser'
 
+# To use debugger
+# gem 'ruby-debug'
 
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-group :development, :test do
-	gem 'rspec', '>= 2.0.0.beta.20'
-  gem 'rspec-rails', '>= 2.0.0.beta.20'
-	gem 'autotest'
-	gem 'webrat'
-	gem 'annotate'
+# assets
+gem 'sass-rails', " ~> 4.0"
+gem 'coffee-rails', " ~> 4.0"
+gem 'uglifier'
+
+group :development do
+  gem 'annotate', '~> 2.6.1'
+  gem 'quiet_assets'
+  gem 'thin'
+  gem 'i18n-tasks', '~> 0.2.10'
 end
+
+group :test do
+  gem 'sqlite3-ruby', '1.3.3', :require => 'sqlite3'
+  gem 'rspec-rails', '~> 2.14.1'
+  gem 'spork'
+  gem 'factory_girl_rails'
+  gem 'webrat'
+  gem 'faker'
+  gem 'json_spec'
+  gem 'autotest'
+  gem 'autotest-rails'
+  gem 'ZenTest'
+  gem 'database_cleaner', '~> 1.2.0'
+end
+