BUG: Changed payment success/failure error messages
Added oid to NAB return link
Merge branch 'develop'