Fix error msg in Angular 5.x

Update Angular to version 5
Removed @Injectable decorator to resolve warning message for Angular 5.x