initial fix for traits and resourceTypes
fixed merge conflicts with master
Merge branch 'master' into RT-Autoindent-Arrays
Merge branch 'master' into RT-Autoindent-Arrays
Merge branch 'master' into RT-Autoindent-Arrays
semantic angular refactor on the autocomplete
Merge branch 'master' into RT-Autoindent-Arrays
Merge branch 'master' into RT-Autoindent-Arrays

Conflicts:
	test/spec/code-mirror.js
	test/spec/raml-hint.js
removed redundant function from lightweight parser
Merge branch 'master' into RT-Autoindent-Arrays
removed unused function
Merge pull request #81 from mulesoft/RT-Autoindent-Arrays

RT: Autoindent for Arrays