Use path to calculate padding for suggestions
Merge branch 'master' into bugs/use-path-to-calculate-padding-61409222

Conflicts:
	test/mocks/editor.js
	test/spec/raml-editor-shelf.js
	test/spec/raml-hint.js
computePath: stop traversing after root has been found
switching to depend more loosely on angular 1.2
Update raml-js-parser
removed traits validation on collapsed console
Merge branch 'master' into chores/downgrade-angular-to-1.2.2
Update api-console
Merge pull request #129 from mulesoft/chores/downgrade-angular-to-1.2.2

Chores/downgrade angular to 1.2.2
Rolled back karma update to previous version
Merge pull request #121 from mulesoft/bugs/use-path-to-calculate-padding-61409222

Use path to calculate padding for suggestions
Merge branch 'master' into functional-tests

Conflicts:
	scenario/test/e2e/raml-example/muse-e2e.js
adding changes to run functional test in travis with firefox