Z-wave update

Meter class added
Minor interface tweaks