Update inspector protocol JSON to M31 branch 1650 http://src.chromium.org/viewvc/blink/branches/chromium/1650/Source/devtools/protocol.json?revision=158234
Make anchors in Quick Docs relative to page URL
Fixed unit tests
Merge remote-tracking branch 'upstream/master' into wp-docs-anchors
Use charAt instead of indexOf
Provide a better way to map to a display key.
Merge remote-tracking branch 'origin/master' into rlim/display-key-issue

Conflicts:
	src/command/KeyBindingManager.js
Call regexp only once when chacking for display key.
Fix the unit test failure caused by processing an invalid key.
fixing a typo: correggiare should be correggere
Merge pull request #9749 from chrispecoraro/patch-4

fixing a typo: correggiare should be correggere
Restore editor keyEvent.

This one wasn't fully deprecated (no warning in console, still in documentation) and there
are still a number of extensions that depend upon it.

Revert "Deprecated by adobe/brackets#6787"

This reverts commit 2e7bc6ab049b5fc50915b54f77e8c1c2b1239845.
Merge pull request #9766 from adobe/dangoor/restore-keyevent

Restore editor keyEvent.
Updated by ALF automation.
alf changes for release branch
Merge pull request #9771 from adobe/randy/alf_loc

alf changes for release branch
Add GitHub Flavored Markdown mode, Add some more Markdown fileExtensions

Note you can only ever get into GFM mode using the Language Switcher.
fileExtensions source: https://github.com/github/markup#markups
Fix some @link and @see tags
Merge branch 'master' into alf_localization
Updated by ALF automation.