2nd fix for User/checkin; now properly returns a Merchant.

Previously I was using CheckinLocation data to populate a Merchant
because I wasn't paying attention to the specific return values.
checkin now properly returns an entire Merchant object.