Collision

circle and rectangle collision
Merge remote-tracking branch 'refs/remotes/origin/feature/collision' into develop
restored entityManager
running version with collision