Get rid of "username" on PlayerScript.cs
Couple of todos
Merge remote-tracking branch 'origin/master'