Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #266 from Ventrella/master

made lots of changes to the hand-holding code
Log cleanup. removed star field meridians.
Merge branch 'master' of https://github.com/worklist/hifi
create and delete voxels locally
create and delete voxels locally
added one more log line
Merge pull request #268 from ZappoMan/render_voxels_optimization

create and delete voxels locally
Merge pull request #267 from PhilipRosedale/master

Stars meridians removed and count reduced, some log cleanup
Merge pull request #269 from Ventrella/master

improved camera first person mode and cleaned up some camera code
made avatars taller an fixed proportions a bit