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
simpler butterflies script that doesn't put as much traffic on entity server
Merge branch 'master' of https://github.com/worklist/hifi
Add ability to set injector properties during playing, and orbitingSound.js
remove debug
Revert "get rid of redundant _displayViewFrustum and use _viewFrustum"

This reverts commit 6d385d9a75de786e0d1f583ad8448c30a9df2492.
get rid of redundant _displayViewFrustum and use _viewFrustum
Revert "get rid of redundant _displayViewFrustum and use _viewFrustum"

This reverts commit 6d385d9a75de786e0d1f583ad8448c30a9df2492.
Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorTest

Conflicts:
	interface/src/MetavoxelSystem.cpp
Update properties window to show properties for locked entities
Update properties tool to be a resizable table
Merge pull request #3908 from PhilipRosedale/master

Orbiting sound example, ability to set injector position, better butterflies
Merge pull request #3909 from ZappoMan/mirrorTest

Revert the removal of _displayViewFrustum for now, since it breaks small mirror
Merge pull request #3911 from huffman/entity-tool-window-polish

Entity Properties Tool Window Polish
Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick