Merge remote-tracking branch 'origin/gui' into gameLogic

Conflicts:
	src/fr/miage/atlantis/Game3DLogic.java
	src/fr/miage/atlantis/graphics/hud/GameHud.java
game3dLogic : added comment
Revert "WORKAROUND: Work around jMonkeyPlatform 3.0.7 onAnimCycleDone"

This reverts commit 9ee4df07eb0645bddf2841490c236c65bf5afb19.

Conflicts:
	src/fr/miage/atlantis/graphics/models/AnimatedModel.java
Merge remote-tracking branch 'origin/gui' into gameLogic
Merge remote-tracking branch 'origin/gameLogic'

Conflicts:
	src/fr/miage/atlantis/Game3DLogic.java
	src/fr/miage/atlantis/graphics/hud/GameHud.java