Added separate collision for platforms
Merge branch 'collision'