Merge remote-tracking branch 'origin/main'

# Conflicts:
#	messages.go

messages.go

@@ -968,7 +968,8 @@ type StatusMessage struct {
 
 type BleManufacturerData struct {
 	CompanyId uint16   `json:"company_id,omitempty"`
-	CompanyName string `json:"company_name,omitempty"`
+	Name      string   `json:"name,omitempty"`
+	Services  []string `json:"services,omitempty"`
 	Data      []byte   `json:"data,omitempty"`
 }