Merge remote-tracking branch 'origin/master' into bchin/update-in-place
Merge pull request #5814 from adobe/nj/issue-5621

Remove workaround for blank line at end from hideLines()
Avoid duplicated implementations of filtering ProjectManager.getAllFiles()
down to just CSS files - provide a new utility function to filter files
based on Language id
Adjust the implementation of Directory.getContents to also return an array of FileSystemStats objects for each of the returned directory contents.
Merge remote-tracking branch 'upstream/master'
Merge branch 'glenn/file-system' of https://github.com/adobe/brackets into glenn/file-system
-removed the conflicting language definition for dust.js files and added
the dust extension to the ejs language definition.
fix cshtml conflict
Merge pull request #5844 from adobe/irichter/fix-5434

removed the conflicting language definition for dust.js files
disallow tabbing to prev and next buttons
Merge pull request #5808 from SAPlayer/live-dev-improvement

Fix #5741: No Live Preview Error when launching Live Preview from an image
Merge pull request #5827 from MohammadYaghobi/master

Update strings.js for Persian language
Merge branch 'master' of https://github.com/adobe/brackets into larz/various-tweaks
Using multiplication sign instead of x in image dimensions.
Using multiplication sign instead x for image quick view.
Using entities based on Raymond's feedback.
Using html() based on Raymond's feedback.
Merge pull request #5835 from adobe/larz/various-tweaks

Small cosmetic tweaks.
Updated by ALF automation.
some more romanian locale improvements