Add contextmenu listener and handler
Merging master
Fix merge problem
Merge branch 'fix-issue-4693' of github.com:lkcampbell/brackets into lkcampbell-fix-issue-4693