...
Merge branch 'test' of https://github.com/DarkSir23/OCTGN into test

Conflicts:
	octgnFX/Octgn.Server/Broadcaster.tt
	octgnFX/Octgn.Server/CardOrientation.cs
	octgnFX/Octgn/DeckBuilder/FilterControl.xaml