more correct model bounding capsule
merge upstream/master into andrew/inertia

Conflicts:
	interface/src/renderer/Model.cpp
formatting some lines that are too long
Merge branch 'master' of https://github.com/highfidelity/hifi
reuse boolean results rather than recomputing them
fix potential floating point error when animations have no frames
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
Merge branch 'master' of https://github.com/highfidelity/hifi
fix two bugs in models not rendering
fix two bugs in models not rendering
tweak
assume we are using a Qt build without bearer management
Merge pull request #2872 from ZappoMan/modelserver

Bug Fixes in Models
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge pull request #2871 from ey6es/master

Better rotations with alternate IK.
Merge pull request #2862 from AndrewMeadows/inertia

improved model bounding shapes
Merge pull request #2873 from birarda/master

assume use of a Qt build without bearer management
Merge branch 'master' of https://github.com/highfidelity/hifi