Prohibit error message when starting live dev from an image file
Remove workaround for blank line at end from hideLines() since it's no longer necessary with latest CM
Update strings.js for Persian language
Update Persian translation
change to English chars
This is for #5726. Fix based on @SAPlayer's feedback.
Removing whitespace between contributor images to remove inline-block's default spacing.
Tweaked img-scale indicator.
Merge pull request #5814 from adobe/nj/issue-5621

Remove workaround for blank line at end from hideLines()
Merge remote-tracking branch 'upstream/master'
-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
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.