Significant intelligence added to the shelf to support the associated
ticket's requirements. E.g. the ability to properly insert shelf elements
into an array of text nodes.
Added test coverage for new APIs.
Pointed bower.json at latest raml-grammar commit.
Code folding preserves error messages
Merge branch 'master' into bugs/protocol-options-are-being-not-offered-properly-62915632

Conflicts:
	app/scripts/controllers/raml-editor-shelf.js
	app/scripts/services/lightweight-dom.js
	app/scripts/services/lightweight-parse.js
	app/scripts/services/raml-hint.js
	test/spec/lightweight-parse.js
adding test for #62915632
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 bugs/protocol-options-are-being-not-offered-properly-62915632

Conflicts:
	bower.json
	scenario/support/protractor.conf.js
	scenario/test/lib/editor-helper.js
Merge branch 'master' into bugs/protocol-options-are-being-not-offered-properly-62915632
adding some config changes - to saucelabs test
cleanup -  config file and editor-helper.
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.
Add `saveMeta` and `loadMeta` to `ramlRepository` service
Merge pull request #184 from mulesoft/chores/add-per-file-metadata

Add `saveMeta` and `loadMeta` to `ramlRepository` service
Merge pull request #172 from mulesoft/bugs/protocol-options-are-being-not-offered-properly-62915632

Bugs/protocol options are being not offered properly 62915632
Eliminating jumping when designer has errors

Added an invisible border to occupy error border space.
Ensure selection of another file on deleteion.
Merge branch 'master' into functional-tests
adding test for #62912124 -
Merge branch 'master' into features/display-error-messages-for-collapsed-code-62912124

Conflicts:
	scenario/test/lib/editor-helper.js