Merge with Master

Author: TomMalbran

.gitmodules

@@ -10,3 +10,18 @@
 [submodule "src/thirdparty/mustache"]
 	path = src/thirdparty/mustache
 	url = https://github.com/janl/mustache.js.git
+[submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/tern"]
+	path = src/extensions/default/JavaScriptCodeHints/thirdparty/tern
+	url = https://github.com/marijnh/tern.git
+[submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/acorn"]
+	path = src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
+	url = https://github.com/marijnh/acorn.git
+[submodule "src/thirdparty/requirejs"]
+	path = src/thirdparty/requirejs
+	url = https://github.com/jrburke/requirejs.git
+[submodule "src/thirdparty/text"]
+	path = src/thirdparty/text
+	url = https://github.com/requirejs/text.git
+[submodule "src/thirdparty/i18n"]
+	path = src/thirdparty/i18n
+	url = https://github.com/requirejs/i18n.git

.travis.yml

@@ -2,4 +2,5 @@ language: node_js
 node_js:
   - 0.8
 before_script:
-  - npm install -g grunt-cli
+  - npm install -g grunt-cli
+  - npm install -g jasmine-node

CONTRIBUTING.md

@@ -1,58 +1,117 @@
-###Curious to start contributing to Brackets?
+# The Basics
 
+### Filing a bug
 
-With this file we want to provide some general guidance how to contribute to Brackets - your [feedback](https://groups.google.com/forum/?fromgroups=#!topic/brackets-dev/yEsaied7Fq8) is very welcome.
+Check the [Troubleshooting Page](https://github.com/adobe/brackets/wiki/Troubleshooting) for common
+issues with installing & launching Brackets, using Live Preview, etc.
 
-Issues starting Brackets the first time? Please review the [Troubleshooting Page](https://github.com/adobe/brackets/wiki/Troubleshooting).         
+**For bugs** be sure to search existing issues first. Include steps to consistently reproduce the
+problem, actual vs. expected results, and your OS and Brackets version number.
+Disable all extensions to verify the issue is a core Brackets bug.
+[Read more guidelines for filing good bugs...](https://github.com/adobe/brackets/wiki/How-to-Report-an-Issue)
 
-## Starter Bugs
+**For feature requests** please first check our [feature backlog](http://bit.ly/BracketsBacklog) to
+see if it's already there. You can upvote features you'd like to see.
 
-If you need some inspiration for a **starter bug**, we have some for you either as [GitHub Issue](https://github.com/adobe/brackets/issues?labels=starter+bug&page=1&state=open) or on the [Trello Board](https://trello.com/board/brackets/4f90a6d98f77505d7940ce88) (there, choose on the right hand sidebar "Filter Cards" and then click on "Starter Feature").
+### Submitting a pull request
 
-## Getting Started
+**Before you start coding**, post to the [brackets-dev Google group](http://groups.google.com/group/brackets-dev)
+or the [#brackets IRC channel on freenode](http://webchat.freenode.net/?channels=brackets) about what
+you're thinking of working on, so you can get early feedback. We don't want you to do tons of work
+and then have to rewrite half of it!
 
-Before you start coding, post to the [brackets-dev Google group](http://groups.google.com/group/brackets-dev) or the [#brackets IRC channel on freenode](http://freenode.net) about what you're thinking of working on, so you can get early feedback. 
-This also provides you with an opportunity to find out what others including the core team are working on.      
+For more on what's expected in a good pull request, see [Contributing Code](#contributing-code) below.
 
 
-Brackets is developed using Agile development methodologies, features are tracked as user stories on the [public Brackets backlog](http://bit.ly/BracketsBacklog). You may _vote_ on existing stories or find stories to work on with others.
+# Ways to Contribute
 
-1. Please sign the [Brackets Contributor License Agreement](http://dev.brackets.io/brackets-contributor-license-agreement.html). You must agree to and submit this before you can contribute to Brackets.
+There are many ways you can contribute to the Brackets project:
 
-1. Please collaborate with others in providing and receiving guidance; the Brackets team made it a priority 
-to look at pull requests daily, however depending on the feature priority, the complexity of a contribution, 
-and available bandwidth we may not be able to work on it right away.
+* **Fix a bug** or **implement a new feature** - read on below.
+* **[Write a Brackets extension](https://github.com/adobe/brackets/wiki/How-to-write-extensions)** and
+  tell us about it!
+* **Test Brackets** and [report bugs](https://github.com/adobe/brackets/wiki/How-to-Report-an-Issue)
+  you find. For sample testing steps, see
+  [Brackets smoke tests](https://github.com/adobe/brackets/wiki/Brackets-Smoke-Tests),
+  [smoke tests with a local server](https://github.com/adobe/brackets/wiki/Brackets-Server-Smoke-Tests), and
+  [UI walkthrough steps](https://github.com/adobe/brackets/wiki/Localization-Tests).
+* **Write unit tests** for Brackets.
+* **Translate** Brackets into other languages (and help keep those translations up to date) - see
+  [localization README](https://github.com/adobe/brackets/blob/master/src/nls/README.md).
+* **Write documentation** and help keep it up to date
+  (the [How to Use Brackets](https://github.com/adobe/brackets/wiki/How-to-Use-Brackets) intro page
+  is one example).
+* **Try out some [Brackets extensions](https://github.com/adobe/brackets/wiki/Brackets-Extensions)**
+  and give feedback to their authors.
 
 
-## Making Changes
-If you use Brackets to edit Brackets, you can quickly reload the app itself by choosing Debug > Reload Brackets from the in-app menu.
-When coding, make sure to follow our [coding conventions](https://github.com/adobe/brackets/wiki/Brackets%20Coding%20Conventions).
+## Where Do I Start?
 
+To start editing the Brackets code, read **[How to Hack on Brackets](https://github.com/adobe/brackets/wiki/How-to-Hack-on-Brackets)**.
+To create your first Brackets extension, check out **[How to Write Extensions](https://github.com/adobe/brackets/wiki/How-to-write-extensions)**.
+
+Here are some ideas:
+
+* [Starter bugs](https://github.com/adobe/brackets/issues?labels=starter+bug&state=open) can
+  provide a good intro to the Brackets code.
+* [Extension ideas](https://github.com/adobe/brackets/issues?labels=Extension+Idea&state=closed)
+  are feature requests that we think would be best implemented as an add-on; it's up to the
+  Brackets community to write them!
+* [Starter features](http://bit.ly/BracketsBacklog) are a bit larger in scope. Be sure to discuss
+  these in the newsgroup before starting. _(To see starter features, click Filter Cards on the
+  right and then click the green "Starter Feature" label)._
+
+Once you're ready to start coding, see the next section, [Contributing Code](#contributing-code).
+
+**I'm new to JavaScript. How can I contribute to Brackets?** Brackets is a lot more complicated
+than the average website that uses JS. Better to start on some JS tutorials (like [Codecademy's](http://www.codecademy.com/tracks/javascript)
+or [MDN's](https://developer.mozilla.org/en-US/docs/JavaScript/Getting_Started)) and contribute
+in some of the other ways listed above. Testing is a great way to start thinking like a programmer
+before you've learned to code!
+
+
+## Contributing Code
+
+To get started editing the Brackets code, read [How to Hack on Brackets](https://github.com/adobe/brackets/wiki/How-to-Hack-on-Brackets).
 
 Before submitting any pull request, please make sure to:
 
-1. read the following wiki page on GitHub: https://github.com/adobe/brackets/wiki/How-to-Hack-on-Brackets.
-1. merge from adobe/brackets master
-1. re-test your code after the merge
-1. run the unit tests with Debug > Run Tests -- everything should pass
-1. if your change is nontrivial or might have affected the UI, run through the [Brackets smoke tests](Brackets-Smoke-Tests) and possibly the [Brackets server smoke tests](Brackets-Server-Smoke-Tests).
-1. review the [Pull Request Checklist](https://github.com/adobe/brackets/wiki/Pull-Request-Checklist) for additional guidance.
+1. Discuss any major changes or questions beforehand in the [brackets-dev newsgroup](http://groups.google.com/group/brackets-dev).
+2. Consider whether your change would be better as an optional extension. Brackets is lightweight
+   and tightly focused - but highly extensible.
+3. Follow the [Pull Request Checklist](https://github.com/adobe/brackets/wiki/Pull-Request-Checklist)
+   to ensure a good-quality pull request.
+4. Sign the [Brackets Contributor License Agreement](http://dev.brackets.io/brackets-contributor-license-agreement.html)
+   (we cannot merge before this).
+
+High quality code and a top-notch user experience are very important in Brackets, and we carefully
+review pull requests to keep it that way. The better you follow the guidelines above, the more likely
+we are to accept your pull request - and the faster the code review will go.
+
 
-## Reviewing Code, Committing
+## The Code Review Process
+
+Brackets committers are responsible for reviewing all pull requests, providing feedback, and
+ultimately merging good code into `master`. The review process ensures all code is high quality,
+maintainable, and well documented.
+
+Once you've opened a pull request, a committer will generally respond to it within a week with an
+initial set of comments (you don't need to ping anyone to find a reviewer). Some pull requests
+raise larger questions about UI design, product scope or architecture. Those are tagged to indicate
+that review will take longer:
+
+* \[PM\] - needs high-level input from product management
+* \[XD\] - needs UI design / visual design discussion
+* \[ARCH\] - needs architectural discussion
 
-In general code reviews can be performed by anyone who knows his/her limits, is familiar with the feature area and the architecture, 
-where the code, being reviewed, is added or altered.
-To submit changes one needs commit rights - those are limited to ensure sustainable high quality. Committers are tasked with taking 
-a leading role in the project by making code contributions, assisting others with their contributions in the form 
-of reviewing and merging pull requests, and providing feedback and suggestions on the direction of the project.
+The best way to avoid this sort of holdup is to discuss your changes on the newsgroup first!
 
-Please refer to the [Committer Policy](https://github.com/adobe/brackets/wiki/Brackets-Committer-Policy) for more information.
-If you want to perform reviews, but don't have commit rights yet, we encourage you to do so. Please add a note that you start reviewing.
-After you have finished your review ping us at IRC or leave a comment that your review has been completed. A committer will submit the pull request based on 
-priority. If a pull request already shows an assignee, please check with him/her first.
+Once your pull request is merged, it will appear in the next release of Brackets - generally within
+two weeks.
 
-##Additional Resources
+**Interested in becoming a committer?** See the [Committer Policy](https://github.com/adobe/brackets/wiki/Brackets-Committer-Policy)
+for details. Committers are expected to take a leading role in the project by making significant
+code contributions, reviewing pull requests, and providing feedback and suggestions on the
+direction of the project.
 
-* [the Brackets github issue tracker](https://github.com/adobe/brackets/issues)
-* [Brackets wiki](https://github.com/adobe/brackets/wiki/Resources)
-* [Contribute Page](http://brackets.io/contribute/)
+Even if you're not a committer, you're still welcome to give feedback on any pull request!

Gruntfile.js

@@ -25,7 +25,7 @@ module.exports = function (grunt) {
     'use strict';
 
     var common = require("./tasks/lib/common")(grunt);
-
+    
     // Project configuration.
     grunt.initConfig({
         pkg  : grunt.file.readJSON("package.json"),
@@ -64,9 +64,21 @@ module.exports = function (grunt) {
             ]
         },
         watch: {
+            all : {
+                files: ['**/*', '!**/node_modules/**'],
+                tasks: ['jshint']
+            },
+            grunt : {
+                files: ['<%= meta.grunt %>', 'tasks/**/*'],
+                tasks: ['jshint:grunt']
+            },
+            src : {
+                files: ['<%= meta.src %>', 'src/**/*'],
+                tasks: ['jshint:src']
+            },
             test : {
-                files: ['Gruntfile.js', '<%= meta.src %>', '<%= meta.test %>'],
-                tasks: 'test'
+                files: ['<%= meta.test %>', 'test/**/*'],
+                tasks: ['jshint:test']
             }
         },
         /* FIXME (jasonsanjose): how to handle extension tests */
@@ -101,20 +113,27 @@ module.exports = function (grunt) {
                             'test' : '../test',
                             'perf' : '../test/perf',
                             'spec' : '../test/spec',
-                            'text' : 'thirdparty/text',
-                            'i18n' : 'thirdparty/i18n'
+                            'text' : 'thirdparty/text/text',
+                            'i18n' : 'thirdparty/i18n/i18n'
                         }
                     }
                 }
             }
         },
+        'jasmine-node': {
+            run: {
+                spec: 'src/extensibility/node/spec/'
+            }
+        },
         jshint: {
             all: [
-                'Gruntfile.js',
+                '<%= meta.grunt %>',
                 '<%= meta.src %>',
                 '<%= meta.test %>'
             ],
-            grunt: "<%= meta.grunt %>",
+            grunt:  '<%= meta.grunt %>',
+            src:    '<%= meta.src %>',
+            test:   '<%= meta.test %>',
             /* use strict options to mimic JSLINT until we migrate to JSHINT in Brackets */
             options: {
                 jshintrc: '.jshintrc'
@@ -132,13 +151,14 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-jasmine');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-watch');
-
+    grunt.loadNpmTasks('grunt-contrib-jasmine-node');
+    
     // task: install
     grunt.registerTask('install', ['write-config']);
 
     // task: test
     //grunt.registerTask('test', ['jshint', 'jasmine']);
-    grunt.registerTask('test', ['jshint']);
+    grunt.registerTask('test', ['jshint', 'jasmine-node']);
 
     // task: set-sprint
     // Update sprint number in package.json and rewrite src/config.json