Merge branch 'master' of https://github.com/rkstar/meteor-reactjs into rkstar-master

# Conflicts:
#	package.js

Author: hipertracker

rkstar:reactjs-tests.js hipertracker:reactjs-tests.jsrkstar:reactjs-tests.js renamed to hipertracker:reactjs-tests.js

@@ -1,50 +1,50 @@
 var meteorVersion = '1.1.0.2',
-    reactVersion = '0.13.2';
+  reactVersion = '0.13.2'
 
 Package.describe({
-    name: 'rkstar:reactjs',
-    summary: 'ReactJS + addons + JSX (--harmony) for Meteor',
-    version: '0.0.10',
-    git: 'https://github.com/rkstar/meteor-reactjs'
-});
+  name: 'hipertracker:reactjs',
+  summary: 'ReactJS + addons + JSX (--harmony) for Meteor',
+  version: '0.0.10',
+  git: 'https://github.com/hipertracker/meteor-reactjs'
+})
 
 Package._transitional_registerBuildPlugin({
-    name: 'compileJSX',
-    use: [],
-    sources: [
-        'plugin/compile-jsx.js'
-    ],
-    npmDependencies: {
-        'react': reactVersion,
-        'react-tools': reactVersion
-    }
-});
+  name: 'compileJSX',
+  use: [],
+  sources: [
+    'plugin/compile-jsx.js'
+  ],
+  npmDependencies: {
+    'react': reactVersion,
+    'react-tools': reactVersion
+  }
+})
 
 
 Package.onTest(function (api) {
-    api.use('tinytest');
-    api.use('rkstar:reactjs');
-    api.addFiles('rkstar:reactjs-tests.js');
-});
+  api.use('tinytest')
+  api.use('hipertracker:reactjs')
+  api.addFiles('hipertracker:reactjs-tests.js')
+})
 
 
 Package.on_use(function (api) {
-    api.versionsFrom(meteorVersion);
+  api.versionsFrom(meteorVersion)
 
-    // Standard distribution of React, same version as react-tools.
-    api.add_files('vendor/react-' + reactVersion + '.js', 'client');
+  // Standard distribution of React, same version as react-tools.
+  api.add_files('vendor/react-' + reactVersion + '.js', 'client')
 
-    // On the server, we use the modules that ship with react.
-    api.add_files('src/require-packages.js', 'server');
-    api.export('React', 'server');
+  // On the server, we use the modules that ship with react.
+  api.add_files('src/require-packages.js', 'server')
+  api.export('React', 'server')
 
-    // Meteor-enabled components should include this mixin via
-    // React.createClass({ mixins: [ReactMeteor.Mixin], ... }).
-    api.add_files('src/ReactMeteor.js', ['server', 'client']);
-    api.export('ReactMeteor', ['server', 'client']);
-});
+  // Meteor-enabled components should include this mixin via
+  // React.createClass({ mixins: [ReactMeteor.Mixin], ... }).
+  api.add_files('src/ReactMeteor.js', ['server', 'client'])
+  api.export('ReactMeteor', ['server', 'client'])
+})
 
 
 Npm.depends({
-    'react': reactVersion
-});
+  'react': reactVersion
+})