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

Conflicts:
	src/fr/miage/atlantis/Game3DLogic.java
	src/fr/miage/atlantis/GameConsoleLogic.java
Merge branch 'gui_console' into gameLogic

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

Conflicts:
	src/fr/miage/atlantis/Game3DLogic.java
InputActionListener: Don't re-pick a boat we're already in
GameTurn: Put tokens on the board at the start of a game
GameLogic: Put initial boats as well when starting a game
Entities: SeaSerpent eats boats too, shark players not on boats
GameLogic: Add AUTOPREPARE mode to skip game setup phase

Will help debugging sessions. When DBG_AUTOPREPARE is set to true,
player tokens and boats are put automatically on the board, and the
game setup phase is skipped (the one where you put your boats and
player tokens on the board).
GameLogic: Turn off AUTOPREPARE by default
Merge branch 'feat_putguysontiles' into gameLogic
GameLogic: Handle not-immediate TileActions
Logging: Remove log messages that are not needed anymore
GameBoard : refactored constructor
gameboard : fixed my REALLY BIG MISTAKE.
Merge remote-tracking branch 'origin/gameLogic' into gui

Conflicts:
	src/fr/miage/atlantis/Game3DLogic.java