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.
Merge remote-tracking branch 'origin' into rlim/word-wrap

Conflicts:
	src/editor/Editor.js
Add back "var" that was accidentally removed when resolving the merge conflict.
Fix a typo that is causing auto close brackets command to be undefined.
Merge pull request #3097 from adobe/rlim/word-wrap

Provide editor options "line numbers", "active line" and "word wrap" as ...