Trunk 4479

Fixed TRUNK-4479: EncounterService.getEncounters should use Person not User for providers. The line endings should be correct now. I couldn't get the rebasing to work correctly through eclipse so there are three commits instead of 1.