Merge branch 'master' of https://github.com/Grabacr07/KanColleViewer
Merge branch 'notifyicon'