Merged develop and fixed conflicts

package.json

@@ -41,7 +41,7 @@
   "private": true,
   "dependencies": {
     "@af/auth": "^11.1.0",
-    "@af/digi-ng": "^12.1.0",
+    "@af/digi-ng": "^14.0.0",
     "@angular/animations": "^11.2.0",
     "@angular/common": "^11.2.0",
     "@angular/compiler": "^11.2.0",
@@ -50,7 +50,7 @@
     "@angular/platform-browser": "^11.2.0",
     "@angular/platform-browser-dynamic": "^11.2.0",
     "@angular/router": "^11.2.0",
-    "@digi/core": "^6.0.2",
+    "@digi/core": "^9.0.0",
     "@digi/styles": "^6.0.2",
     "@nrwl/angular": "11.5.1",
     "rxjs": "~6.6.3",