Email Address collected in salesforce
Created new custom fields and collect dat into SF
Merge branch 'rr-calculatorcleanup' into staging