most of collision using basic bounding boxes
Merge commit '5751a9459744aefc79de13c37b204f70b942520f'