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
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
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of git://github.com/highfidelity/hifi into 19630

Conflicts:
	interface/src/Application.cpp
Remove QGLWidget include from NodeBounds
Reorder includes in NodeBounds.cpp
Merge branch 'master' of https://github.com/worklist/hifi into modelserver