lamp_nopower added to makefile, fixed state machine
Merge branch 'master' of https://github.com/mysmartgrid/hxb-messesetup