Consolidated two HA discovery JSON to one

web/hadiscover.json

@@ -14,5 +14,5 @@
       "mf" : "%s",
       "cu" : "%s"
     },
-    "stat_cla" : "%s"
+    "stat_cla" : %s
 }

web/hadiscover1.json

@@ -1,17 +0,0 @@
-{
-    "name" : "%s",
-    "stat_t" : "%s%s",
-    "uniq_id" : "%s_%s",
-    "obj_id" : "%s_%s",
-    "unit_of_meas" : "%s",
-    "val_tpl" : "{{value_json['%s']}}",
-    "dev_cla" : "%s",
-    "dev" : {
-      "ids" : [ "%s" ],
-      "name" : "%s",
-      "mdl" : "%s",
-      "sw" : "%s",
-      "mf" : "%s",
-      "cu" : "%s"
-    }
-}