GameTurnTest : test testStartTurn
Rien
Merge branch 'junit' of https://github.com/xplodwild/Atlantis into junit

Conflicts:
	test/fr/miage/atlantis/board/GameBoardTest.java
Audio: Add AudioManager and Main Menu music
nothing, just fix in nullgamelogic
Nothing (just a little fix)
Nothing
nothing
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
GameTurnTest : test   testMoveEntity_GameEntity_GameTile() in progress
GameTurnTest : testMoveEntity_GameEntity_GameTile() finish
Gui : removed unnecessary functions.
GameTurnTest : test in progress testMoveEntity_GameEntity_Boat() & testMoveEntity_GameEntity_GameTile()
Merge remote-tracking branch 'origin/gameLogic' into gui

Conflicts:
	src/fr/miage/atlantis/Game3DLogic.java
	src/fr/miage/atlantis/graphics/hud/HudManager.java
Merge branch 'gui' of https://github.com/xplodwild/Atlantis into gui
GameTurnTest.java : add testMoveDiceEntity

It remains some errors, I need to discuss about them with team mates.
AudioManager: Play some sounds!