trying to figure out what's wrong with player token
really hack-y fix to the player token problem. Must deal with the 2 map instances that each have their own playerToken.
Merge branch 'master' into tokenfix