Group lights by room

[chmac]

First so it's easier to choose them, then so that it's also possible to select a room and choose all the lights inside it.