Merge pull request #437 from SalesforceFoundation/feature/420-kill-globals

Feature/420 kill globals
Using a reentrant flag for contacts in AFFL_Affiliations_TDTM.
Merge pull request #443 from SalesforceFoundation/feature/282-two-affiliations-created

Using a reentrant flag for contacts in AFFL_Affiliations_TDTM.
Merge dev into feature/420-kill-globals