+collision with treemap
Merge branch 'master' into controller
*improved collision
Merge branch 'controller'