userid branch: Added userid and jointid to the TOUCH and TANGIBLE event.