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