Ajout de l'animation sur la vue PlayerZoneDisplay
Merge branch 'develop' into featuresDisplayPlayerZone

Conflicts:
	TP1-BatailleNavale/batailleNavale/src/ca/mbqcnp/bataillenavale/opengl/GLEnnemyZoneDisplay.java
	TP1-BatailleNavale/batailleNavale/src/ca/mbqcnp/bataillenavale/opengl/animation/CannonballAnimation.java
Merge branch 'featuresDisplayPlayerZone' into develop