Fixed the stuff killed by a bad merge, should properly initialize the default user from the documents directory.
Merge remote-tracking branch 'origin/GamePlayTest' into GamePlayTest