Merge.
Delete unused parameter.
Store payment method in checkout.
Refactor order submission and fix bug concerning setting shipping address.
Merge.