Collisions fixes for XY
Merge branch 'master' of https://github.com/egenvall/ProjektIT
More collision fixes - should be good to play now!