merge

After a complicated merge, hopefully it's all ok now. I have added two new classes: AvatarTouch, and HandControl. Also, some small tweaks and formatting.