layout changes
Merge branch 'master' of https://github.com/Zpiritual/fluxx
fixed various issues with switchplayer and activeplayer etc.
Merge branch 'master' of https://github.com/Zpiritual/fluxx