Expanded circles collisionsystem.
Merged parallell changes.