Added collision box
Merge branch 'physics' into bullet