Clear paymentInProgress when there's an error.
Add error message to payment page when there's an error.
Change field street to address in payment profile.
Merge pull request #331 from benkonrath/some-payment-fixes

Some payment fixes