Vertical ship placement
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/src/app/game/gameController.js
Vertical ship placement
(cherry picked from commit 5697bf1)