modif square & triangle collider + fixed bug
Merge remote-tracking branch 'origin/Rirols' into ThomasS