Authenticate user the right way

Fix #1335
Add Cancelled payment state translation
Merge pull request #1341 from winzou/fix/paymentstate

[Payment] Add Cancelled payment state translation
Merge pull request #1340 from winzou/fix/authentication

[Core] Authenticate user the right way
Merge branch 'master' into base