Collision géré
Merge branch 'master' of https://github.com/jmcomets/EUSDAB
Merge branch 'master' of https://github.com/jmcomets/EUSDAB
Merge branch 'master' of https://github.com/jmcomets/EUSDAB

Conflicts:
	tests/entity/testentity.cpp