Fix up the appearance of the tree.
Merge branch 'ProjectManager' of https://github.com/adobe/brackets into ProjectManager

Conflicts:
	src/project/FileTreeViewModel.js
	src/project/ProjectManager.js