Merge remote-tracking branch 'ntrrlz/master' into workingOnMac

Conflicts:
	SongRequest.SongPlayer.VlcPlayer/SongPlayer.cs