Changed branch of rails to include ActionController::Live module

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails',     github: 'rails/rails', branch: 'async'
+gem 'rails',     github: 'rails/rails', branch: 'master'
 gem 'journey',   github: 'rails/journey'
 gem 'arel',      github: 'rails/arel'
 gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders'

Gemfile.lock

@@ -25,25 +25,9 @@ GIT
     journey (2.0.0.20120723141804)
 
 GIT
-  remote: git://github.com/rails/sass-rails.git
-  revision: 9b60259818a0c5d929d2c6c6e6beb63b4517d972
-  specs:
-    sass-rails (4.0.0.beta)
-      railties (>= 4.0.0.beta, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 1.0)
-      tilt (~> 1.3)
-
-GIT
-  remote: git://github.com/rails/sprockets-rails.git
-  revision: f688130db8d2c8565b2b913cdcdf391aa810f793
-  specs:
-    sprockets-rails (1.0.0)
-      railties (>= 4.0.0.beta, < 5.0)
-      sprockets (~> 2.4.3)
-
-PATH
-  remote: /Users/aaron/git/rails
+  remote: git://github.com/rails/rails.git
+  revision: 3d55957c3d024e592f847b1128e939038f3588a7
+  branch: master
   specs:
     actionmailer (4.0.0.beta)
       actionpack (= 4.0.0.beta)
@@ -84,6 +68,24 @@ PATH
       rdoc (~> 3.4)
       thor (>= 0.15.4, < 2.0)
 
+GIT
+  remote: git://github.com/rails/sass-rails.git
+  revision: 9b60259818a0c5d929d2c6c6e6beb63b4517d972
+  specs:
+    sass-rails (4.0.0.beta)
+      railties (>= 4.0.0.beta, < 5.0)
+      sass (>= 3.1.10)
+      sprockets-rails (~> 1.0)
+      tilt (~> 1.3)
+
+GIT
+  remote: git://github.com/rails/sprockets-rails.git
+  revision: f688130db8d2c8565b2b913cdcdf391aa810f793
+  specs:
+    sprockets-rails (1.0.0)
+      railties (>= 4.0.0.beta, < 5.0)
+      sprockets (~> 2.4.3)
+
 GEM
   remote: https://rubygems.org/
   specs: