Merge pull request #653 from nsendetzky/master

Fixes bugs in checkout process for address and service pages