Merge branch 'qml_view' of https://github.com/ZiminGrigory/SeaBattle into qml_view

Conflicts:
	client/src/qmlView/qml/Battle.qml
Merge branch 'qml_view' of https://github.com/ZiminGrigory/SeaBattle into qml_view

Conflicts:
	client/src/qmlView/qmlMainWindow.cpp
Merge branch 'master' of https://github.com/ZiminGrigory/SeaBattle into qml_view

Conflicts:
	client/src/qmlView/qml/Battle.qml
some fixes
sounds & background music now work
123
resized mode
звук настроен корректнее