roomplayer more
Merge remote-tracking branch 'origin/modularizeTake1' into dev-less-room