apply goimports
update paymentd rights
Merge remote-tracking branch 'upstream/master' into cleanup
Merge pull request #74 from wongak/cleanup

Cleanup