Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Fixed spacing at parenthesis
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
turned off voxel grabbing
Merge branch 'master' of https://github.com/worklist/hifi
Third person camera transition doesn't happen on movement.
merge fix
Merge branch 'master' of https://github.com/worklist/hifi
Turned avatar balls off
Changed horizontal field of view to a constant, made it 90 degrees
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Add field of view as an option in preferences
Merge pull request #599 from PhilipRosedale/master

3P transition turned off, field of view now in preferences