Merge remote-tracking branch 'upstream/master'

hmmm.......
toolkit and transaction admin
Merge remote-tracking branch 'upstream/master'

what?
removed a test file
merged changes with jesse