Added collisionType to zepp
Merge branch 'master' of https://github.com/hyunlim/flyby