Merge remote-tracking branch 'origin/master' into Step3-redesignPayment
Ready-State v.3
- added Sellign-Options to Step 5
- changed functions for billing-options
Merge branch 'Step3-redesignPayment'

Conflicts:
	js/main.js
	step3.php