Updated files so they match E4 submission

Pretty sure the only significant change was the added javadocs in
PlayerInfo.
Everything should be up to date now -- other than all the changes that
have been proposed since the E4 submission.