Fix comment
Trade builder
UserTrade builder
Merge pull request #753 from zholmes1/develop

Trade and UserTrade builders