スクリーンショットの設定でpngとjpgを選べるように変更。 #7
UI 微調整・ReSharper 警告の解除
Merge remote-tracking branch 'upstream/master' into original

Conflicts:
	Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
	Grabacr07.KanColleViewer/Properties/Resources.ja-JP.resx
	Grabacr07.KanColleViewer/Properties/Resources.resx
	Grabacr07.KanColleViewer/ViewModels/SettingsViewModel.cs
	Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs
	Grabacr07.KanColleViewer/Views/Settings/Settings.xaml
Normalise line endings