Use a variable for the proper string
Merge remote-tracking branch 'origin' into rlim/search-exclusions
Fix PreferencesManager test.

This is a fix for #6917. The problem was that
`openAndSelectDocument(nonProjectFile` was being called outside of a `run()`
block, so sometimes the nonProjectFile would be open rather than file that
was supposed to be open.
Merge pull request #6968 from adobe/nj/issue-6967

[cmv4] Make Esc cancel multiple selection if there is one instead of...
Update to latest v4
add comment about why important must be used
Merge pull request #6946 from adobe/larz/issue-6702

Making sure line error background color always overrides other background colors.
First pass at UI for Find in Files exclusion filters. Not wired up to
seach implementation or prefs yet.

Changes the search bar to use ModalBar's autoClose behavior; no longer
assumes its code is the only thing to ever close the bar. Adds a new API to
ModalBar to allow the search bar to be 'locked open' when it would normally
close, as Find in Files needs for its no-results state and when the filter
editor dialog is open.
Merge remote-tracking branch 'origin/rlim/search-exclusions' into pflynn/search-exclusions

* origin/rlim/search-exclusions:
  Fix JSLint error for extra trailing whitespaces.
  Switch to global view state instead of project-based one and also limit it to ten globs.
  Remove an incorrect assignment.
  Initial implementation search exclusion using project-based view setting.
safer check for jquery object
Merge pull request #6956 from adobe/nj/cmv4-change-event

[cmv4] Fix issues with doc syncing in inline editors
Both variable declarations at the same place
Remove .livehtml flag
Merge from cmv4
Add Michael Hernandez to the whitelist.
Merge pull request #6995 from adobe/rlim/update-white-list

Add Michael Hernandez to the whitelist.
Merge pull request #6955 from adobe/jasonsanjose/code-hint-list-jquery

Check for jquery property instead of instanceof
Merge pull request #6725 from mjherna1/6587-switch-language-uses-self-name

Issue #6587 - Added language self names to strings-app.js
Inject remote functions earlier after frameNavigated instead of loadEventFired
Code review fixes