Merge pull request #4886 from adobe/dangoor/4736-delete-across-tags

[LiveHTML] domdiff redo
Merge branch 'master' into ResearchLiveHTML
Merge branch 'ResearchLiveHTML' of https://github.com/adobe/brackets into ResearchLiveHTML

Conflicts:
	src/thirdparty/CodeMirror2
Fix for #4898 undo deletion of paragraph boundary.

The freezing was fixed by the domdiff redo. This commit fixes the
actual problem and makes the result match up properly.
Updated by ALF automation.
Merge pull request #4961 from adobe/alf

ALF Automation
Improve documentation and simplify a unit test
change livehtml default to false
use CodeMirror setSize() instead of $.height() for editor resize. workaround #4564
move flag to global brackets object
Merge pull request #4955 from adobe/pflynn/dialog-font-win

Workaround for #4567 (Dialog text renders poorly on Windows)
Merge branch 'adobe-randy/LiveHTML-icon' into ResearchLiveHTML

Conflicts:
	src/LiveDevelopment/LiveDevelopment.js
fix HighlightAgent unit tests
Update swedish translation for sprint 30.
Merge pull request #4960 from adobe/dangoor/4898-undo-tag-merge

[LiveHTML] Fixes 4898: undo of tag merge
fix links in czech translation for @kvarel pull #4926
Merge pull request #4965 from adobe/randy/LiveHTML-unittests

Fix HighlightAgent unit tests
Merge pull request #4967 from adobe/kvarel/pull-4926

Sprint 29 Czech
update to master's CodeMirror SHA
Merge pull request #4919 from adobe/larz/issue4889

Added Brackets Blue highlight in file tree.