Merge remote-tracking branch 'Grabacr07/master'

Conflicts:
    Grabacr07.KanColleWrapper/Models/RepairingDock.cs