Merge pull request adobe#5907 from adobe/iwehrman/issue-5891

Make FileSystemEntry.parentPath null for root directories

Brackets Sprint 33 release

Merge pull request adobe#5424 from adobe/pthiessUpdates

Updating NOTICE file.  Reviewed by kkarlesk.

Merge pull request adobe#5282 from adobe/nj/issue-5279

Don't reparse HTML files on save

Merge pull request adobe#5212 from SAPlayer/patch-4

Update strings.js, some new german translations

Merge pull request adobe#4975 from adobe/jasonsanjose/issue-4966-rebase

Fix live dev issues after ResearchLiveHTML merge

Merge pull request adobe#4871 from adobe/alf

ALF Automation

Merge pull request adobe#4355 from vertexclique/patch-2

Added CMD_SHOW_IN_OS and CMD_FILE_DELETE translations

Merge pull request adobe#4700 from adobe/dangoor/4543-cancel-update

Extension Manager: Clears the update/remove flags when you cancel.

Merge pull request adobe#4595 from adobe/dangoor/v8-crash-redux

v8 crash (acorn parsing) workaround