update collision system
Merge branch 'develop' of https://github.com/slimeguild/girls-shooting