playerqueue and more
premerge
Merge branch 'logic' into develop