Got all loading people tests to pass.
Had to change a number.
Merged in player loading tests and implementation. Fixed merge conflicts
Merge branch 'bchalifo-master'