Added collisions between entities
Merge branch 'master' into collisions