Objects are now sorted, collisionboxes won't become huge
Merge remote-tracking branch 'origin/CallebergBranch' into cbmerge