Rename brackets-quick-edit.png to quick-edit.png. This simplifies the Edge Code overlay.
Merge branch 'master' into iwehrman/rename-quick-edit-screenshot

Conflicts:
	samples/pl/Szybki Start/index.html
revert change to unit test fixture
revert change to unit test fixture again
Merge pull request #3353 from adobe/iwehrman/rename-quick-edit-screenshot

Rename brackets-quick-edit.png to quick-edit.png
Merge remote-tracking branch 'upstream/master'