repair collision info mismatch
Ignore Visage resources in .gitignore except for tracker.cfg
tabs to spaces
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
Merge pull request #3921 from Atlante45/tabs_to_spaces

Tabs to spaces
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