Merge branch 'master' into advanced-permissions-phase-1

app/app.go

@@ -66,6 +66,8 @@ type App struct {
 	clientLicenseValue atomic.Value
 	licenseListeners   map[string]func()
 
+	siteURL string
+
 	newStore func() store.Store
 
 	htmlTemplateWatcher  *utils.HTMLTemplateWatcher