Keep entities in single collection and rework collision detection
Merge pull request #6 from nthomson/keep_entities_in_single_collection

Keep entities in single collection and rework collision detection