Merge branch 'master' of https://github.com/worklist/hifi
Merge remote-tracking branch 'upstream/master'
Made JointState transforms private.

Also changed some function names to be more descriptive.
Using "Hybrid" to describe frame with world-rotation + model-local-origin.
merge andrew/inertia into andrew/ragdoll

Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/renderer/Model.h
remove 'fromBind' argument to getJointRotation()
unravel rotation code by giving proper names

The goal is: eliminate dependency on JointState::_combinedRotation
(which is joint-to-world) and store joint-to-model transforms instead
Ported over fixes that I made when working on delta-encoding for avatars.
Curved Oculus overlay around camera as a semicircle
Added Oculus Options menu
Merge branch 'master' of https://github.com/worklist/hifi
Fixed Oculus overlay color bug
_distance variable
Working on support for streaming Qt enums/flags.
dynamically malloc/free arrays to avoid stack overflow on windows.
starting with 0 for array index will give a reasonable value for 'first'.
rolling back previous change for IK instability
Fixed coding standard
start timer BEFORE moving it to another thread, because Qt otherwise will protest and the timer does not run at all - at least on windows.

this fixes restarted servers not getting properly recognized by the interface - at least on windows.
Merge pull request #2975 from talentraspel/19749

start timer BEFORE moving it to another thread, because Qt otherwise wil...
Merge pull request #2976 from talentraspel/19751

dynamically malloc/free arrays to avoid stack overflow on windows.
Add joint manipulations in model-frame