Payment form improvement
Merge remote-tracking branch 'origin/shopping-cart' into shopping-cart

Conflicts:
	Moviq/Views/Templates/payment-page.html