Merge branch 'master' of https://github.com/adobe/brackets
merge with master
Merge branch 'master' of https://github.com/adobe/brackets