fixed merge conflict and duplicate donation check with associated donors... skipping first donation for some reason
Merge branch 'dev' of github.com:gusIreland/tbw-donor-php into dev