displaceShip
Merge remote-tracking branch 'origin/master'

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/gameComponents/Board.java
	games/src/pl/praktykiatrem/game/battleship/gameComponents/Place.java
	games/src/pl/praktykiatrem/game/battleship/rules/CustomRules.java
Merge remote-tracking branch 'origin/Wiktor'

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/gameComponents/Board.java
	games/src/pl/praktykiatrem/game/battleship/gameComponents/Place.java
	games/src/pl/praktykiatrem/game/battleship/graphic/BasicPresenter.java
	games/src/pl/praktykiatrem/game/battleship/graphic/IBasicPresenter.java
	games/src/pl/praktykiatrem/game/battleship/graphic/panels/IBoardSettingsObserver.java
	games/src/pl/praktykiatrem/game/battleship/graphic/panels/ShipSettingPanel.java
	games/src/pl/praktykiatrem/game/battleship/rules/CustomRules.java