unit test for embedded styles in inline editor
add unit test for finding embedded style blocks
merge conflict
LanguageManager documentation fixes
Added EntityHints unit tests
Make thw line height be 1.25 times taller than the font-size when required
Fix for the StatusBar line count grammar error by changing the string when the file has 1 line
Remove the unused NO_DISABLED_DIRECTORY string
Fix Issue #3511

when inserting a hint which is not a valid property name, such as 'my-key', insert the hint as ["my-key"] instead of .my-key.

insertHint now runs the hint through the acorn tokenizer to see if it looks like a valid property name.  If it's invalid, it replaces the '.' with brackets.
Refactored some code in Session.getType() - pulled out a method to find the leading '.' in a property lookup, and use that method from the insertHint logic as well.
Added 3 new unittests to test this new behavior.
Better error messages for AddMenu and AddMenuItem
Update tern - fixes #3606, #3605

Also update acorn, as latest tern needs the latest version of acorn.

Codehinting tests all pass, and performance does not seem to have degraded.
Visual tweaks for the quick open drop-down.
Re-instrument after document changed.
Merge branch 'master' of https://github.com/adobe/brackets into larz/quick-open-tweaks
Updated branch based on NJ's feedback
Replace .isResolved & .isRejected with .state
Merge branch 'master' of https://github.com/adobe/brackets into larz/quick-open-tweaks
Updated based on @peterflynn's feedback.
Merge pull request #3584 from TomMalbran/tom/fix-issue-3583

Fix #3583: There is a grammar error with the string "1 lines"
Merge branch 'master' of https://github.com/adobe/brackets into larz/quick-open-tweaks