Changes to show intellisense for @inject directive
Merge branch 'release' into dev