Pull setup commit
Playback logic improved. Fixed player and group adding bugs