Merge branch 'development'
Merge branch 'development'
Fix add card
Stripe customer payment now checks if the customer already has a card
Merge branch 'master' into development