renames player to user
Merge remote-tracking branch 'origin/master'

* origin/master:
  *Merged Planet
  Conflict solved for Fix Sunsystem