Stripe changes

Stripe
stripe

stripe changes
Merge remote-tracking branch 'origin/shopping-cart' into shopping-cart

Conflicts:
	Moviq/Js/controllers/homeController.js