version of the teahouse scene with the changes to tea object manipulation that Marc Destefano & I made today
there was a merge conflict so in case this clobbered something important in the scene that kevin did, we can revert to his version and redo the work from this one (pretty simple, mostly just colliders on the teaset)