Replaced all calls toShapeIndex to ShapeId
Removed obsolete Debug VectorAssociation calls
Merge remote-tracking branch 'refs/remotes/origin/Collision_hashtable' into Collision_hashtable