switch upstream master branch
Validate time formats.

refs #220
Implement locking of clinical advice modals and add CA to Micro lists.
refs #60 #107
Update templates to show name not value refs #60
Merge requirements conflict
merging in master
merging in master
Include extra OPAT referral fields
Move add episode to elCID
Fix inconsistent form controls for adding a patient
refs #277
refs #181
Adding an upcoming appointments field.
refs #247
Use actual type field.
tweak brandname
Frist pass OPAT line assessment field.
refs #216