New collide functions
Merge branch 'webplate-master' into floatbonus