adding injector for dependency injection
Merge local changes into develop