Merge dev into feature/sprint13-misc-fixes
Merge dev into feature/sprint13-misc-fixes
fix #440.  As an administrator, I want the UDR wizard to not allow me to create field that I cannot actually use such as text fields.
code cleanup and improvements for user defined rollups panel
Merge dev into feature/sprint13-misc-fixes
getting Payment Mappings and Recurring Donation Mappings more consistent with User Rollup Settings in terms of ui and validating which fields can map to each other.
Merge branch 'feature/sprint13-misc-fixes' of https://github.com/SalesforceFoundation/Cumulus into feature/sprint13-misc-fixes
getting Payment Mappings and Recurring Donation Mappings more consistent with User Rollup Settings in terms of ui and validating which fields can map to each other.
Merge pull request #611 from SalesforceFoundation/feature/sprint13-misc-fixes

fixes for RD Mapping, Opp/Pmt Mapping, UserRollups