Merge branch 'master' into notifyicon

Conflicts:
	Grabacr07.KanColleViewer/ViewModels/Contents/Docks/BuildingDockViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/Docks/RepairingDockViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/ExpeditionViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/ReSortieBarViewModel.cs
	Grabacr07.KanColleViewer/Views/Contents/Dockyard.xaml
	Grabacr07.KanColleViewer/Views/Contents/Expeditions.xaml
	Grabacr07.KanColleViewer/Views/Contents/Repairyard.xaml
通知領域対応に伴うリソースの修正
コーディングルールに則りフィールド名を修正