Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties
Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties
Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties
Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties
rename Models to Entities, and add menu option to disable Light entities
only remap textures on the render thread, fix deadlock, and improve handling of changes to textures
fix possible deadlocks
fixes to the Model List feature in editModels.js and added it to new edit
Merge branch 'master' of https://github.com/highfidelity/hifi into lockAndMaterialProperties
Merge pull request #3710 from ZappoMan/lockAndMaterialProperties

Improvements to Entities