fix
Merge branch 'master' of https://github.com/SunInJuly/SeaBattle

Conflicts:
	SeaBattle.pro
firts implementation of game server
Merge branch 'tcp-server' of https://github.com/EvgeniyMsk/SeaBattle into view

Conflicts:
	SeaBattle.pro
	client/gui/sounds/sounds.qrc
	client/src/audioPlayer/audioPlayer.h