make float literals obey the coding standard
improved collision shapes of models
improved method for disabling bad joint shapes
more correct bounding shapes for Models
merge upstream/master into andrew/inertia
Merge pull request #2689 from AndrewMeadows/inertia

improved collision shapes for head models
Merge pull request #2695 from birarda/master

changes to smooth JS dynamic bot demo
Merge branch 'master' of https://github.com/highfidelity/hifi
fix a geometry race condition crash