stylus
custom title bar text w/project name, flat (Mac OS X Yosemite-esque) traffic light icons
Merge branch 'stylus'
add proxy dialog
number tabs extension
Merge branch 'master' of https://github.com/adobe/brackets

Conflicts:
	src/thirdparty/CodeMirror2