set highlighted element before scrolling it into view
Merge remote-tracking branch 'origin/master' into randy/issue-7762
Update Tern; implement timeout
Fix test for new DOM values
Do replacements in memory if a file is in the working set but not yet open (for #8160)
Properly track offsets for multiline regexps in Find/Replace in Files (for #8162)
Adds jscodehints.inferenceTimeout preference
Update Acorn to 0.6.0
Only listen for left clicks for entering rename mode
Merge pull request #8155 from adobe/randy/update-tern

JS Code Hints Crash Preventer
Merge pull request #8194 from SAPlayer/file-right-click-no-rename

Only listen for left clicks for entering rename mode
Turn off click-to-rename for folders to address #8200
Merge pull request #8172 from adobe/nj/issue-8160

Do replacements in memory if a file is in the working set but not yet open
Merge pull request #8204 from adobe/nj/issue-8200-disable-folder-rename

Turn off click-to-rename for folders
Fix commas that should be semicolons
Add an explicit non-breaking space before "with" in template
Merge pull request #8206 from adobe/rlim/explicit-space-in-template

Add an explicit non-breaking space before "with" in template
Clarify that in the single-line case, we're just using the total length of the match to calculate the offset
Explicitly set the value of 'collapsed' for #8208
Merge pull request #8177 from adobe/nj/issue-8162

Properly track offsets for multiline regexps in Find/Replace in Files