fix merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	LoLUpdater/MainWindow.xaml.cs