some hacking on server performance
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
merge
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling

Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	assignment-client/src/octree/OctreeServer.h
Wait until both head and body are loaded before rendering.  Closes #2145.
When switching models, retain old one until new one is loaded.  Closes #2146.
Added Freddy’s 50 cocktail party clips
Fixed seg fault, don't attempt to transfer joints between different models
(as opposed to different LODs).
Process geometry/textures in worker threads (via QThreadPool).  Closes #2137.
fixed some warnings
handle some shutdown cases and reduce time of locking in octree server
Indentation fix.
Merge pull request #2148 from ey6es/master

Various improvements to model loading: wait until head and body are loaded before rendering; render old model until new one is loaded when switching; process geometry/textures in worker threads.
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #2150 from birarda/master

make Agent the parent of its ScriptEngine
Merge branch 'master' of https://github.com/worklist/hifi
When we send data to the avatar mixer, send the tweaked head rotation.  Closes
Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling

Conflicts:
	libraries/shared/src/ResourceCache.cpp