Merge remote-tracking branch 'remotes/origin/adminui' into adminui

# Conflicts:
#	src/Frontend/Jp.AdminUI/src/app/panel/persisted-grants/list/persisted-grants-list.component.html
#	src/Frontend/Jp.AdminUI/src/app/panel/persisted-grants/list/persisted-grants-list.component.ts
#	src/Frontend/Jp.AdminUI/src/assets/i18n/en.json
#	src/Frontend/Jp.UI.SSO/jpProject_sso_log.txt

Author: brunobritodev

build/build.ps1

@@ -7,8 +7,8 @@ $adminui = (Get-Item -Path ($src + "/Frontend/Jp.AdminUI") -Verbose).FullName
 
 $paramsSSO= "/c cd " + $sso + " && dotnet run";
 $paramsAPI= "/c cd " + $api + " && dotnet run";
-$paramsUI= "/c cd " + $ui + " && ng serve";
-$paramsAdminUI= "/c cd " + $adminui + " && ng serve";
+$paramsUI= "/c cd " + $ui + " && npm start";
+$paramsAdminUI= "/c cd " + $adminui + " && npm start";
 
 Write-Information Restore deps
 dotnet restore $sso

src/Frontend/Jp.UserManagement/package-lock.json

@@ -13,7 +13,7 @@
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve --port 4200",
     "build": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",