Merge branch '0.10'

Conflicts:
	README.md
	lib/react/rails/railtie.rb
	lib/react/rails/version.rb
	react-rails.gemspec
	test/jsxtransform_test.rb

Author: zpao

lib/react/rails/railtie.rb

@@ -21,7 +21,7 @@ class Railtie < ::Rails::Railtie
 
       # run after all initializers to allow sprockets to pick up react.js and
       # jsxtransformer.js from end-user to override ours if needed
-      initializer "react_rails.setup_vendor", :after => "sprockets.environment" do |app|
+      initializer "react_rails.setup_vendor", :after => "sprockets.environment", group: :all do |app|
         # Mimic behavior of ember-rails...
         # We want to include different files in dev/prod. The unminified builds
         # contain console logging for invariants and logging to help catch

react-rails.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'execjs'
   s.add_dependency 'rails', '>= 3.1'
-  s.add_dependency 'react-source', '0.9.0'
+  s.add_dependency 'react-source', '0.10.0'
   s.add_dependency 'connection_pool'
 
   s.files = Dir[

test/jsxtransform_test.rb

@@ -14,8 +14,7 @@
 (function() {
   var Component;
 
-  Component = React.createClass({
-    displayName:'Component',
+  Component = React.createClass({displayName: 'Component',
     render: function() {
       return ExampleComponent( {videos:this.props.videos} );
     }