Adapted swap figures

now it works with the collision manager.
Merge branch 'develop' of https://github.com/Dincu/Geometry into develop
Fixed bug with collision with figures

The colors and figures of the validators got reseted.
Merge branch 'develop' of https://github.com/Dincu/Geometry into develop