Fixes + Merge

This will break the merge, will commit right after.
Merge remote-tracking branch 'origin/master'

Conflicts:
	LegendaryClient/Windows/MainPage.xaml.cs