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

Conflicts:
	client/gui/pictures/pictures.qrc
Merge branch 'master' of https://github.com/EvgeniyMsk/SeaBattle

Conflicts:
	client/gui/pictures/pictures.qrc
Merge branch 'ship_installation_tips' of https://github.com/EvgeniyMsk/SeaBattle
tip about uncompleted fleet installation