burdel na kołkach
Merge remote-tracking branch 'origin/Wiktor'

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/graphic/ISettingView.java
	games/src/pl/praktykiatrem/game/battleship/graphic/panels/ShipSettingPanel.java