Doing some file formatting
Fix failing tests in EncounterServiceTest - TRUNK-4545
TRUNK-4492 - Removed column "Tribe" from demo-data.