Provide editor options "line numbers", "active line" and "word wrap" as new menu items under View menu.
Provide editor options "line numbers", "active line" and "word wrap" as new menu items under View menu.
Merge branch 'rlim/word-wrap' of https://github.com/adobe/brackets into rlim/word-wrap
Merge remote-tracking branch 'origin' into rlim/word-wrap

Conflicts:
	src/editor/Editor.js
Merge remote-tracking branch 'origin' into rlim/word-wrap

Conflicts:
	src/editor/Editor.js
Merge branch 'rlim/word-wrap' of https://github.com/adobe/brackets into rlim/word-wrap
Add unit tests for word-wrap and active line options.
Merge remote-tracking branch 'origin' into rlim/word-wrap

Conflicts:
	src/command/Commands.js
	src/nls/root/strings.js
Move auto close brackets to EditorOptionHandlers.js file.
Add back two strings being removed from merge.
Fix all issues in Jason's review comments
Refactor some of repeated lines in Editor.js to a private function.
Refactor some common code into a function.
Remove the extra quote.
fixes #3163 (file handle is leaked on invalid zip files) by
destroying the readstream when there's a parse error.
Remove unnecessary _setInstaller() function
Move _getFields() into unit test
Return existing promise from show() if mistakenly called twice
Make all status bar indicators inline-block, since that seems to work fine and it makes the spinner work without a special exception
Initial code review: acknowledge that Canceling is async and may fail (e.g.
if download had actually completed already) - adds two new states to the
progress UI.
Smaller cleanups: fix done() handler indents in Package.js; add "request"
to package.json; convert British "cancelled"->"canceled"; rename
"RealInstaller"; plus some other minor cleanups.
Merge remote-tracking branch 'origin' into rlim/word-wrap

Conflicts:
	src/editor/Editor.js
Make all InstallExtensionDialog tests run in the same window so they run fast