gameboard : fixed overlap of tiles Water #56-58
Merge remote-tracking branch 'origin/gameLogic' into junit

Conflicts:
	src/fr/miage/atlantis/board/GameBoard.java