戦闘海域リアルタイム表示に対応
Merge branch 'feature/server' of github.com:koji123/logbook into feature/server

Conflicts:
	main/logbook/data/context/GlobalContext.java