small fix in collision component
Merge branch 'master'
Getting that collision resolusion fixed :/
small tiny change to collision octagon
Merge branch 'master'
Merge branch 'master'