123
ата-ташные адаптеры...
123
Merge branch 'qml_view' of https://github.com/EvgeniyMsk/SeaBattle into qml_view

Conflicts:
	client/src/view/view.pri
разбирайтесь сами
123
Merge branch 'qml_view' of https://github.com/ZiminGrigory/SeaBattle into qml_view
now it works