remove usd from tip msg, add unit
Merge remote-tracking branch 'upstream/master'