Basic player and teams update

Set all players and teams to marine basics.
Merge pull request #1 from SoulRider/basic-player

Basic player and teams update
Merge pull request #2 from SoulRider/master

Update current master in map entity branch