Hotfix: nullptr exception in collisionComponent fixt
Merge branch 'master'