Merge branch 'glenn/file-system' of https://github.com/adobe/brackets into glenn/file-system
Add FileSystemEntry.parentPath getter.
Merge branch 'brackets' into glenn/file-system

Conflicts:
	src/project/ProjectManager.js
Merge branch 'glenn/file-system' of https://github.com/adobe/brackets into glenn/file-system
Double quotes
Properly handle unknown self-close tags
Merge pull request #5750 from adobe/larz/issue-5747

Using a muted selection color instead of gray for unfocused window.
Updated by ALF automation.
Update strings.js for Persian language
Update Persian translation
Merge branch 'master' into find-in-files-focus
change to English chars
removed getFilenameExtension
changed getFilenameExtension test to getFileExtension
Merge pull request #5825 from adobe/alf_localization

ALF Automation
Adding css.erb to css file extensions
Merge pull request #5815 from adobe/nj/issue-5068

When autoindenting, only insert a tab if the cursor doesn't move due to CodeMirror's indentation
Merge pull request #5793 from SAPlayer/find-in-files-focus

Fix #5699: Set focus to input field when hitting Find In Files when it is already open
This is for #5726. Fix based on @SAPlayer's feedback.
Removing whitespace between contributor images to remove inline-block's default spacing.