Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	angular.json
#	package-lock.json
#	package.json
#	src/app/app.component.html
#	src/app/app.routes.ts

angular.json

@@ -127,45 +127,8 @@
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n"
-        },
-        "ionic-cordova-serve": {
-          "builder": "@ionic/angular-toolkit:cordova-serve",
-          "options": {
-            "cordovaBuildTarget": "Knots-Front:ionic-cordova-build",
-            "devServerTarget": "Knots-Front:serve"
-          },
-          "configurations": {
-            "production": {
-              "cordovaBuildTarget": "Knots-Front:ionic-cordova-build:production",
-              "devServerTarget": "Knots-Front:serve:production"
-            }
-          }
-        },
-        "ionic-cordova-build": {
-          "builder": "@ionic/angular-toolkit:cordova-build",
-          "options": {
-            "browserTarget": "Knots-Front:build"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "Knots-Front:build:production"
-            }
-          }
         }
       }
     }
-  },
-  "cli": {
-    "schematicCollections": [
-      "@ionic/angular-toolkit"
-    ]
-  },
-  "schematics": {
-    "@ionic/angular-toolkit:component": {
-      "styleext": "scss"
-    },
-    "@ionic/angular-toolkit:page": {
-      "styleext": "scss"
-    }
   }
-}
+}