Merge branch 'master' into show-apply-config-when-needed

model/misc.go

@@ -10,6 +10,7 @@ type Interface struct {
 type BaseData struct {
 	Active      string
 	CurrentUser string
+	Admin       bool
 }
 
 // ClientServerHashes struct, to save hashes to detect changes

model/user.go

@@ -6,4 +6,5 @@ type User struct {
 	Password string `json:"password"`
 	// PasswordHash takes precedence over Password.
 	PasswordHash string `json:"password_hash"`
+	Admin        bool   `json:"admin"`
 }