repair collision info mismatch
make collision callbacks work
Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions
fix deadlock in enter/leave events
add ID to the properties dialog box
fixed CR feedback
Merge pull request #3924 from ZappoMan/entityCollisions

make collision callbacks work as entity methods
Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus
guard against NULL _models