first cut at shape collisions
swith to using shape collider instead of spheres
make sphere entities use sphere shape for better collisions
Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites
make sure to scale default octree shape collision to meters
allow you to edit mass
Merge pull request #3486 from ZappoMan/moreWorkOnCollidingEntitites

Improvements to entity collisions (using shape collider)