Merge branch 'develop'

# Conflicts:
#	package-lock.json
#	package.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.8.0",
+  "version": "4.5.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

projects/common/src/fm/services/admin.service.ts

@@ -1,10 +1,9 @@
-import { HttpClient, HttpParams } from "@angular/common/http";
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { IItem } from '../models/item';
-import { IUser } from '../models/user';
+import { HttpClient, HttpParams } from "@angular/common/http";
 import { AppConfig } from "../shared/app.config";
-import { ItemTypeService } from './itemtype.service';
+import {ItemTypeService} from './itemtype.service';
 
 @Injectable({
   providedIn: 'root',
@@ -43,8 +42,4 @@ export class AdminService {
   deleteItem(code: string): Observable<any> {
     return this.httpClient.delete<any>(`${this.ApiEndpoint()}/api/v1/admin/${code}`);
   }
-
-  getAllUsers(): Observable<IUser[]> {
-    return this.httpClient.get<IUser[]>(`${this.ApiEndpoint()}/api/v1/admin/users`);
-  }
 }