client fixed
Merge branch 'master' of https://github.com/Parasithe/Battleship

Conflicts:
	Client/SettingsPartie.xaml.cs