Merge pull request #1 from VioletGrey/2-1-stable

Affiliate Reporting