Temporary commit for merge
BUG FIX: Fixed CollisionManager NPE bug, fixed null rectangles/images/sizes in objects, particularly MapObject