Clean up Scala dependency injection, add a test for controller injection
Merge pull request #1538 from wsargent/1538-change-ScalaDependencyInjection-page

[doc] Make ScalaDependencyInjection have examples, proper formatting