Merge remote-tracking branch 'upstream/master'
Trigger open_node.jstree when opening empty folders
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
For issue #850 - Remap ERR_UNSUPPORTED_ENCODING to NOT_READABLE_ERR. Mapped ERR_UNSUPPORTED_ENCODING to NOT_READABLE_ERR instead of SECURITY_ERR.
Add grunt tasks for jshint and jasmine. Refactor and move package.json, replace existing with config.json. Add Travis-CI support.
fix jshint errors in Gruntfile.js
remove generated config.json
add build status image
use postinstall hook to generate config.json
add missing grunt-cli dep
remove socket.io dep
syntax error in package.json
temporary toggles for testing
Fix JSHINT bad linebreaking errors
Fix indentation errors
missing open brace
remove switch statement
Merge branch 'master' into jasonsanjose/travis

Conflicts:
	src/brackets.config.json
Update shortcuts on native menus.