buggy Txn code, PaymentActivity broken
Merging with fixes to Txn

Merge remote-tracking branch 'origin/master'