changed all globals back to public (except were needed), and removed unnecessary virtuals.
Merge branch 'feature/420-kill-globals' of https://github.com/SalesforceFoundation/Cumulus into feature/420-kill-globals

Conflicts:
	src/classes/CAO_Constants.cls
change globals to public
Merge dev into feature/420-kill-globals
Merge pull request #439 from SalesforceFoundation/feature/436-include-layouts

Include layouts
Merge dev into feature/420-kill-globals
remove Type pick list values
Merge branch 'feature/420-kill-globals' of https://github.com/SalesforceFoundation/Cumulus into feature/420-kill-globals
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/436-include-layouts