Refactored Staff to take many of the responsibilities of StaffSet. Created StaffInfo (with associated builder) to cut down on the parameters in StaffSet and Staff.
Merge remote-tracking branch 'origin/player' into player