Pull check-in admin changes from checkin-kiosk branch.

I should have separated these out to begin with.