Fixed #868 - wrong battlefield in ship-to-ship combat
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop