Fixes bug that chosen country in address isn't selected when returning to the page
Removes delivery/payment option from list if it isn't available
Merge pull request #653 from nsendetzky/master

Fixes bugs in checkout process for address and service pages