version 2.6 release
Merge branch 'master' of https://github.com/Grabacr07/KanColleViewer
マージミスを修正