Use mouseup instead of click on delete button
Call Object.prototype.hasOwnProperty.apply()
Merge remote-tracking branch 'origin/master' into glenn/issue-3002
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
More preferences ID cleanups
Add unit tests for word-wrap and active line options.
Use longer timeout (20 sec) when reading files from a network drive.
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.
Refactor JSLint into an extension
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.
Use a new API (fs.isNetworkDrive) to detect a network drive.
Merge remote-tracking branch 'upstream/master' into tom/prefs-id-cleanup-2
Improved getClientID and getPreferenceStorage
Check errors before adjusting timeout.