We are having to remove AVS verification because we don't track Address2 in dbo.PaymentInfo nor do we ask for it.
Also added City and State to Managed Giving form since we were originally getting that from the avs lookup.
Since avs is now out, we still need to validate first, last, address, city, state, and zip for one-time giving / registrations.  Also we needed to prefer paymentinfo billing address to be displayed first rather than the using the people record address.
Merge branch 'save-payment-details' into develop