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
Add Node border display
Merge branch '19630' of github.com:huffman/hifi into 19630

Conflicts:
	interface/src/Menu.h
Working on joystick support using SDL.
Avoid unused variable warnings in Xcode.
First cut at adding external joysticks to the mix.
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
Fixed index of out bounds error, issue with head not being tracked in
PrioVR.
Basic joystick integration.
reuse boolean results rather than recomputing them
Move server borders to a submenu
Cleanup NodeBounds
Update parameter to const
fix potential floating point error when animations have no frames
Fix node bounds overlay blinking

QString.to* do not seem to return null terminated strings.
Explicitly null-terminate a string
Update old comment