UHM-938: "Check In" a patient for an appointment with the same location
Some display and wording tweaks
Merge remote-tracking branch 'origin/master'