Merge branch 'master' of https://github.com/Projet5001/java into hit.detection

Conflicts:
	core/src/actors/MyActor.java
merge
remove doublons
Merge branch 'hit.detection' of https://github.com/Projet5001/java into hit.detection