Merge pull request #695 from Gravecorp/master

Reworked proxygenerator
Quantity of multicard observable correctly now.
Merge pull request #696 from Gravecorp/master

forgot the csproj
I'm guessing line endings here...
Merge branch 'master' of github.com:kellyelton/OCTGN
Filters working in deck editor.
Tie in of proxygen to gameserialization