Stripe integration in progress
Merge branch 'develop' into mahfuz

Conflicts:
	config/routes.rb