Merge remote-tracking branch 'upstream/master'
Merge branch 'release' of https://github.com/adobe/brackets
Merge branch 'master' of https://github.com/MiguelCastillo/brackets
Merge branch 'release' of https://github.com/adobe/brackets
Merge branch 'master' of https://github.com/MiguelCastillo/brackets
Merge branch 'master' of https://github.com/adobe/brackets

Conflicts:
	src/thirdparty/CodeMirror2
Merge branch 'master' of https://github.com/adobe/brackets
Merge branch 'master' of https://github.com/adobe/brackets
Merge branch 'master' of https://github.com/MiguelCastillo/brackets
Merge branch 'master' of https://github.com/adobe/brackets
Merge branch 'master' of https://github.com/adobe/brackets
Updated variables in brackets.less.
Updated variables in brackets_codemirror_override.less.
Added Core UI variables.
brackets_patterns_override.less partially done.
Merge branch 'master' of https://github.com/MiguelCastillo/brackets
Merge branch 'master' of https://github.com/adobe/brackets
Merge branch 'master' of https://github.com/adobe/brackets
Corrected variable references in test files.
brackets_patterns_override.less WIP