Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
Splitting hand collisions between other avatars and ourself.
Moving hand-avatar collision trigger calls into MyAvatar

Also renaming some methods in Model to be more descriptive.
Merge branch 'avatar-interaction' of ssh://github.com/AndrewMeadows/hifi into avatar-interaction
Removing HeadData::findSpherePenetration() as unused cruft.
Minor whitespace removal.
Only do slaps for MyAvatar.
Making arm restoration rate independent of FPS and easier to tune.
tweaks to default menus for alpha, make Gravity false so we don't fall into abyss
Merge pull request #1991 from ZappoMan/removesomedefaultsettings

DO NOT MERGE: tweaks to default menus for alpha
more tweaks, removed old clouds
Merge pull request #1993 from ZappoMan/removesomedefaultsettings

More menu tweaks
Hand-face collisions now work (sorta).
Making the lean recovery use more tuneable parameters.
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction

Conflicts:
	interface/src/avatar/Hand.h
	interface/src/avatar/MyAvatar.cpp
Fixing a comment.
Improved comment about limitation of collision check.
Merge pull request #1994 from AndrewMeadows/avatar-interaction

Avatar interaction