Code folding preserves error messages
Merge branch 'master' into features/display-error-messages-for-collapsed-code-62912124

Conflicts:
	app/scripts/controllers/raml-editor-main.js
	app/views/raml-editor-main.tmpl.html
	test/spec/raml-editor-main.js
Merge branch 'master' into features/display-error-messages-for-collapsed-code-62912124
Retain error marks when content changes.

Error marks are redrawn after each change to the editor's content.
Before this fix, the redrawing of the error mark did not account for
errors contained by folds.
Merge branch 'master' into features/display-error-messages-for-collapsed-code-62912124