watch your language...
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
Fixed typo
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
Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus
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
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.
move emit of collisions to after done moving entities, so that callbacks can delete entities
Use the 1450 limit everywhere, in case other places are running into the issue
I experienced with metavoxels.