Merge branch 'master' of github.com:worklist/hifi
Merge branch 'master' of github.com:worklist/hifi
fix for collisions when wearing Oculus
Merge branch 'master' of github.com:worklist/hifi
Have the local avatar glow when moving.
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	interface/src/avatar/Avatar.cpp
Merge branch 'master' of github.com:worklist/hifi
Glow when moving.
Merge pull request #884 from ey6es/master

Have the avatars glow when moving.
Argh, forgot to return the result of the superclass implementation.
Merge pull request #885 from ey6es/master

Fix for network crash.
Make the surrounding spheres glow when moving, too.
"Laser pointer" for transmitter.
Yes, these should be consts.
Merge pull request #886 from ey6es/master

Glowing "laser pointer" for transmitter, when not in drive mode.  Also, make the avatar spheres glow.
Merge branch 'master' of github.com:worklist/hifi
Render the ball heads with the voxeltar bodies.
Merge pull request #888 from ey6es/master

Render the ball heads with the voxeltar bodies.
implementing @problem's proposed changes to menus
Merge pull request #889 from birarda/new-menu

implementing @problem's refactored menu setup