Merge pull request #941 from Gravecorp/test

OCT-7 complete. also fixes #919 and #206
Merge pull request #942 from Gravecorp/test

OCT-6 and fixes #864
Auto generated commit for version 3.1.55.157-Test
Second fix for duplicating card issue.