(syntax) Added highlighting for some ngDoc-specific jsDoc attributes
Merge branch 'master' of github.com:andrewstuart/vim-javascript
Merge branch 'master' into develop

Conflicts:
	syntax/javascript.vim