Unify autocompletion by ctrl-space and while typing
Merge branch 'master' into bugs/autocomplete-by-ctrl-space-60333662

Conflicts:
	app/scripts/services/code-mirror.js
	test/spec/raml-editor-main.js
Go back to JSON.parse while reading config options
Merge branch 'master' into bugs/autocomplete-by-ctrl-space-60333662

Conflicts:
	app/scripts/controllers/raml-editor-main.js
	test/spec/raml-editor-main.js
Merge pull request #124 from mulesoft/bugs/autocomplete-by-ctrl-space-60333662

Unify autocompletion by ctrl-space and while typing