Fixed issues with remote includes of JSON
removed extra files
Made transformResponse option local to this request specifically
Updated parser
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' of github.com:mulesoft/api-designer into bugs/regex_on_get_property

Conflicts:
	bower.json
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
Updated parser with latest version
Fixed bower
Updated parser to version with inflection fix
updating test suite to run them on firefox
Fixed dependencies, and localScenario
Fixed dependeny issues
Merge branch 'master' of github.com:mulesoft/api-designer into bugs/regex_on_get_property
Merge branch 'master' into functional-tests