Adding devices for Glass, Android
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
(1) raised Eve's hand; (2) renamed some member variables; (3) added more functionality to hand-holding
Slow down when near other avatars - incremental commit
Merge remote-tracking branch 'upstream/master'
Merge pull request #178 from ZappoMan/render_voxels_optimization

fixed local mode
Avatars are now slowed down when they get near other avatars, for easy fine positioning.
Merge remote-tracking branch 'upstream/master'
Changed idle simulate call to 16msecs (which will set avatar mixer rate at 60FPS), further small stats improvements
Merge pull request #177 from Ventrella/master

I made a few minor fixes in Avatar
fixed merge problem
Merge remote-tracking branch 'upstream/master'
Merge pull request #180 from Ventrella/master

fixed merge issue
Merge remote-tracking branch 'upstream/master'
Fixes per code review.
Merge pull request #179 from PhilipRosedale/master

Improved stats display (Mbps), enumerated transmitter devices, avatars slow down around people
Ground plane moved to 0->10 and lines are exactly 1 meter
Merge pull request #184 from PhilipRosedale/master

Moved ground plane, 1 meter spacing
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization