merge changes from develop branch - can now switch on/off lights from lights tab