implement CAT-1064 - When collision between
add test and change testsuite for collision tests
solve conflicts of rebaseing
Merge pull request #1051 from Catrobat/physics_CAT-1064_whenCollisionBetweenFix

Physics cat 1064 when collision between fix