22
Merge branch 'master' of github.com:ghchen/AVSyncer

Conflicts:
	KanColleTool/ShipListPage.xaml
	KanColleTool/ShipListPage.xaml.cs