Merge remote-tracking branch 'origin/master-horizontal'
Merge remote-tracking branch 'upstream/master'
v2.4 r390
sooo bad
Merge branch 'master' of https://github.com/LynxyssCZ/KanColleViewer
Revert "Merge branch 'master' of https://github.com/LynxyssCZ/KanColleViewer"

This reverts commit 809b38af330df57ef38b2ccd27e54b775317026b, reversing
changes made to 2b4e8bff2580b35e2d7c6274f286274e941819ea.

	modified:   Grabacr07.KanColleViewer/KanColleViewer.csproj
	deleted:    Grabacr07.KanColleViewer/Themes/TabViewHorizontal.xaml
	modified:   Grabacr07.KanColleViewer/Views/Contents/Dockyard.xaml
	modified:   Grabacr07.KanColleViewer/Views/Contents/Expeditions.xaml
	modified:   Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml
	modified:   Grabacr07.KanColleViewer/Views/Contents/Homeport.xaml
	modified:   Grabacr07.KanColleViewer/Views/Contents/Overview.xaml
	modified:   Grabacr07.KanColleViewer/Views/Contents/Quests.xaml
	modified:   Grabacr07.KanColleViewer/Views/Contents/Repairyard.xaml
	modified:   Grabacr07.KanColleViewer/Views/Controls/KanColleHost.cs
	deleted:    Grabacr07.KanColleViewer/Views/Info.xaml
	deleted:    Grabacr07.KanColleViewer/Views/Info.xaml.cs
	modified:   Grabacr07.KanColleViewer/Views/MainContent.xaml
	modified:   Grabacr07.KanColleViewer/Views/MainWindow.xaml
	modified:   Grabacr07.KanColleViewer/Views/StartContent.xaml
	modified:   Grabacr07.KanColleViewer/Views/Tools/Rankings.xaml
	modified:   README.md
Merge remote-tracking branch 'upstream/master'
CC -> Fast BB
* As the guys on /jp/ pointed out. Kongou-class ships started off as cruisers and then turned over to BBs after being modernized. So I'll just keep it to that.
Michisio -> Michishio
proxy tests
Full proxy translator
Quests incoming
	modified:   Grabacr07.KanColleViewer/App.xaml.cs
	modified:   Grabacr07.KanColleWrapper/KanColleProxy.cs
	modified:   Grabacr07.KanColleWrapper/KanColleWrapper.csproj
	new file:   Grabacr07.KanColleWrapper/KancolleProxyTranslate.cs
	new file:   Grabacr07.KanColleWrapper/StreamTranslator.cs
Merge remote-tracking branch 'upstream/master'
Merge branch 'proxy-tests'
Merge master to master-horizontal
Quest translator
Merge master to master-horizontal