Merge of workingSetReorder and workingSetSort events
Move the project preference dialog variables to the template
Use templates for the search dialog and results
Merge remote-tracking branch 'upstream/master' into tom/fix-issue-2076
Use sort when enabling automatic sort. Allow to register/get a sort method with a Command object. Refactored some code. Fixed some comments.
Add the ability to open files with paths of the form "path[:lineNumber[:columnNumber]]".
Fix lint errors. Change default column number to 0 instead of 1.
Merge branch 'master' into marks/open-line-col
Add unit tests for _parseDecoratedPath. Use regExp.exec() instead of String.replace(). Use an explicit compare to null, rather than if(xxxx).
Merge branch 'master' of https://github.com/adobe/brackets into marks/open-line-col
Add some comments describing recommended tests for the new functionality.
add new test cases
Translate in French
Merge pull request #12 from edge/bchin/merge-Brackets-master

merging latest Brackets (Sprint 26) master
corrected Translation
Merge remote-tracking branch 'public/master'
do not wrap regular expresssions in '^' and '$', only strings.
Merge branch 'test3' of https://github.com/jodyzhang/brackets into jody-test3

Conflicts:
	src/extensions/default/JavaScriptCodeHints/unittests.js
save as
jslint