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

Conflicts:
	Grabacr07.KanColleViewer/Views/StartContent.xaml