Reintroduced angular dependencies
Fixed dependency injection
Merge branch 'deployment'