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
fix bug preventing butterflies from animating

(forgot to make base method virtual)
add DIRTY_UPDATEABLE flag for changes that need it
Merge pull request #3924 from ZappoMan/entityCollisions

make collision callbacks work as entity methods
Merge pull request #3925 from AndrewMeadows/thermonuclear

fix for non-animating models
Reduce the MTU size to deal with Windows networking issue.
Merge pull request #3926 from ey6es/master

Reduce the MTU size to deal with Windows networking issue.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels