Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Arrow keys adjust distance from camera in mirror mode, air guitar script
removed some unneeded stuff
Merge branch 'master' of https://github.com/worklist/hifi
move #include <StreamUtils.h> to cpp file
overhaul of CollisionInfo

store Cube info for sphereAACube collisions
correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't
fix bad penetration depth for interior of cube
Provide options for model translation: by default, pivot about mesh bounds'
center; allow numeric translation or pivot about joint position.
Merge branch 'master' of https://github.com/highfidelity/hifi
mute environment packet
Merge branch 'master' of https://github.com/highfidelity/hifi into mute_env
Merge pull request #2807 from PhilipRosedale/master

AirGuitar.js, arrow keys move fwd/back in mirror view
Fix for windows
Merge branch 'master' of https://github.com/worklist/hifi
fixed overlay not moving on resize in editModels.js
Fix for certain models with textures not parented to materials.
Merge branch 'master' of https://github.com/highfidelity/hifi