fixed #146
Warking on #149
Merge branch 'hotfix/paymentupdate' into develop

Conflicts:
	src/main/php/gettext.php