A little dependency injection: Interfaces to Classes, using Guice
Inject using factories, Strings and Files
Handle more dependency injection: With factory:, class:, duplicate injectClass, etc.
Merge branch 'guice' into develop