wip
Merge branch 'master' into web
Added the device state edition. We can now turn on or off a plug
Merge branch 'master' into web