Added EncounterRole (from AdministrativeEncounterRole zip), along with 2 new encounter types for vitals and pre-op surgery