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.
rolling back previous change for IK instability
Fixed coding standard
Add joint manipulations in model-frame
Add more model-frame methods
remove world-frame hand/palm set methods
Mouse input and magnification for Oculus Overlay
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay