addressed Trade sorting related to issue #225
Merge remote-tracking branch 'upstream/develop' into develop