Remove some function-declarations-inside-control-flow

Issue #1206
Take inclusiveLeft/Right into account when preventing editing of readOnly spans
Different fix for 'null' showing up in token classes

Issue #1214
Format match-highlighter to follow conventions
[searchcursor addon] Remove forgotten debugger statements
Correct a typo in manual.html
Add mark-selection addon and demo page
Clean up mark-selection add-on
[match-highlighter addon] Rewrite to use defineOption and an overlay
[match-highlighter addon] Update documentation
Repair context menu on IE9
Merge upstream, discarding local changes

Conflicts (checkout from master):
	addon/search/match-highlighter.js
	addon/selection/mark-selection.js
	demo/markselection.html
	demo/matchhighlighter.html