Merge branch 'master' into debtcalc
added postmoney to the right output rail
copy changes
Merge branch 'debtcalc' into testing