Merge branch 'hotfix/paymentupdate2'
Updated bug
Merge branch 'hotfix/gettextbug' into develop