rename shapeShape() to be collideShapes()

Also add collideShapesCoarse()
remove cruft
rename more shapeShape() to be collideShapes()
emit signal on avatar body-body collisions
emit events for hand-avatar collisions
merge
merge upstream/master into andrew/scripting
example JS for handling avatar collisions
remove unnecessary change
replace .f with .0f as per coding standard
adding names to arguments in collisionWithAvatar() declaration
merge upstream/master into andrew/scripting

Conflicts:
	interface/src/avatar/MyAvatar.cpp
Merge pull request #2641 from AndrewMeadows/scripting

avatar-avatar collisions are now exposed to JS