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
gameturn : adding player rotation
board : fixed tile 64 / 74 not linking properly
Merge remote-tracking branch 'origin/gui' into gameLogic
gamestart : player table dynamic building
gui : Now start game depending on player numbers
gameturn : starting gui rotation animation
gameturn : Player gui rotation added (2 Player)
gameturn : Player gui rotation (3 & 4 Player)done
Merge remote-tracking branch 'origin/gui'

Conflicts:
	src/fr/miage/atlantis/Game3DLogic.java
Merge remote-tracking branch 'origin/gameLogic'

Conflicts:
	src/fr/miage/atlantis/Game3DLogic.java
	src/fr/miage/atlantis/graphics/hud/GameHud.java
Buttons : music & sound btn toggling.
project : Format code & fix import
Merge remote-tracking branch 'origin/gui'

Conflicts:
	src/fr/miage/atlantis/entities/Shark.java
	src/fr/miage/atlantis/graphics/AnimationBrain.java
	src/fr/miage/atlantis/graphics/InputActionListener.java
	src/fr/miage/atlantis/logic/GameTurnListener.java
gui : changed nick size for observer players
Merge remote-tracking branch 'remotes/origin/master' into audio

Conflicts:
	src/fr/miage/atlantis/Game3DLogic.java
	src/fr/miage/atlantis/graphics/Game3DRenderer.java
	src/fr/miage/atlantis/gui/Gui.java
	src/fr/miage/atlantis/gui/controllers/GuiController.java
	test/fr/miage/atlantis/board/NullGameLogic.java
	test/fr/miage/atlantis/logic/GameRenderListenerTest.java