update collider test to show contour data
Merge branch 'master' of https://github.com/chukong/CocoStudioSamples into #3320
Fixed #3320
fixed #3320
Merge pull request #36 from pipu/#3320

#3320