Collision detector made working with different mesh types
Merge remote-tracking branch 'origin/master'