Merge branch 'master' into dev

custom_components/fpl1/fplEntity.py

@@ -30,16 +30,17 @@ class FplEntity(CoordinatorEntity, SensorEntity):
             DOMAIN, self.account, self.sensorName.lower().replace(" ", "")
         )
 
-    @property
-    def name(self):
-        return f"{DOMAIN.upper()} {self.account} {self.sensorName}"
-
     @property
     def device_info(self):
         return {
             "identifiers": {(DOMAIN, self.account)},
             "name": f"FPL Account {self.account}",
+<<<<<<< HEAD:custom_components/fpl1/fplEntity.py
             "model": VERSION,
+=======
+            "model": "FPL Monitoring API",
+            "sw_version": VERSION,
+>>>>>>> master:custom_components/fpl/fplEntity.py
             "manufacturer": "Florida Power & Light",
         }