stash
Binary Sensors
Merge branch 'master' into simulation
streamlined simulationflux
fixed one bug, introduced another.
Merge branch 'simulation'