Updates for world and collision detection

-CollisionModel is now tested and working properly
-CollisionModel collidesWith(...) takes different parameters
-Changed Entity to work with new CollisionModel
-Added Rectangle conversion to World2D

commit build-id = b0000-044