adressed minor remark
Removed unused dependency
Merge remote-tracking branch 'origin/master' into nj/http-server-unit
code cleanup after unit test review
Merge pull request #2992 from adobe/nj/http-server-unit

Unit tests for StaticServerDomain
Merge remote-tracking branch 'origin/master' into jrb/issue-2987-2988

Conflicts:
	src/extensions/default/StaticServer/main.js
move node connection to init code
update docs, make it so unit test code can always get the _staticServerProvider
Update strings.js

update new strings
minor fixes from code review
Merge pull request #2993 from adobe/jrb/issue-2987-2988

move starting of static server to live dev start time and fix up some comments
update CodeMirror SHA for #2974
Merge pull request #2995 from adobe/alf

ALF Automation
Merge pull request #2940 from WebsiteDeveloper/DefaultMenus

Extracted default menus into extra file
Merge branch 'master' into jasonsanjose-dk/language-api
fixed mode handling for text/plain and validation of mode
fix language unit tests
Merge pull request #2958 from adobe/jasonsanjose/issue-2830

Fix vscrollbar in inline editor when increasing font size
add unit tests for StaticServerProvider
Merge remote-tracking branch 'upstream/master' into tom/fix-issue-1399