Map has player markers now
Merge branch 'master' into dev